diff --git a/documentation/current/eiffelstudio/eiffelstudio-how-tos/browsing/viewing-information-about-component/viewing-information-about-class.wiki b/documentation/current/eiffelstudio/eiffelstudio-how-tos/browsing/viewing-information-about-component/viewing-information-about-class.wiki
index e6786045..6993dc59 100644
--- a/documentation/current/eiffelstudio/eiffelstudio-how-tos/browsing/viewing-information-about-component/viewing-information-about-class.wiki
+++ b/documentation/current/eiffelstudio/eiffelstudio-how-tos/browsing/viewing-information-about-component/viewing-information-about-class.wiki
@@ -2,7 +2,7 @@
[[Property:weight|2]]
[[Property:uuid|6ec8ca83-fbe0-e02c-2570-68b5f3931083]]
Once you [[Centering tools on a component|centered the editor]] on a class, you have access to its [[Class formatters: Basic text view|basic text]]. If the class is compiled, the [[Feature tool|feature tool]] shows the list of the features that are defined or redefined in this text. You can also view [[Clickable view|clickable]], [[Class formatters: Flat view|flat]], [[Flat Contract view|flat contract]] and [[Contract view|contract]] views of the class in the editor. The class tab in the context tool can display more information. If the [[Centering tools on a component|context tool is independent]], [[Centering tools on a component|center it]] on the wanted class and select this tab. You can then see information about the features ([[Routines|routines]], [[Attributes|attributes]], [[Exported features|exported features,]] [[Class views|etc.]] ..) of the class, its [[Ancestors|ancestors]] and [[Descendants|descendants]] or its [[Clients|clients]] and [[Suppliers|suppliers]] .
-The [[Metric tool: Introduction|metric tool]] provides another kind of data. It allows you to compute a complete set of [[How to analyze a project|measures]] on your class.
+The [[Metrics tool|metric tool]] provides another kind of data. It allows you to compute a complete set of [[How to analyze a project|measures]] on your class.
{{seealso|
[[Looking for a class|Looking for a class]] }}
diff --git a/documentation/current/eiffelstudio/eiffelstudio-how-tos/browsing/viewing-information-about-component/viewing-information-about-cluster.wiki b/documentation/current/eiffelstudio/eiffelstudio-how-tos/browsing/viewing-information-about-component/viewing-information-about-cluster.wiki
index 4ea85935..3dee9b67 100644
--- a/documentation/current/eiffelstudio/eiffelstudio-how-tos/browsing/viewing-information-about-component/viewing-information-about-cluster.wiki
+++ b/documentation/current/eiffelstudio/eiffelstudio-how-tos/browsing/viewing-information-about-component/viewing-information-about-cluster.wiki
@@ -1,7 +1,7 @@
[[Property:title|Viewing information about a cluster]]
[[Property:weight|1]]
[[Property:uuid|daff6cb5-89bd-4281-4c1e-cf031391a34b]]
-To view information about a cluster, you have to center the context tool on this component. Then the [[Metric tool: Introduction|metric tool]] will provide a complete set of measures that you will able to compute.
+To view information about a cluster, you have to center the context tool on this component. Then the [[Metrics tool|metric tool]] will provide a complete set of measures that you will able to compute.
{{seealso| '''See Also'''
[[Looking for a cluster|Looking for a cluster]]
[[How to analyze a project]] }}
diff --git a/documentation/current/eiffelstudio/eiffelstudio-how-tos/browsing/viewing-information-about-component/viewing-information-about-feature.wiki b/documentation/current/eiffelstudio/eiffelstudio-how-tos/browsing/viewing-information-about-component/viewing-information-about-feature.wiki
index 888635ca..18183fbc 100644
--- a/documentation/current/eiffelstudio/eiffelstudio-how-tos/browsing/viewing-information-about-component/viewing-information-about-feature.wiki
+++ b/documentation/current/eiffelstudio/eiffelstudio-how-tos/browsing/viewing-information-about-component/viewing-information-about-feature.wiki
@@ -2,7 +2,7 @@
[[Property:weight|3]]
[[Property:uuid|0151eab9-ee25-210a-bed9-b2709e9fa5f0]]
Once you [[Centering tools on a component|centered the editor]] on a feature, you have access to its text. The feature tab in the context tool can display more information. To have access to it, you have first to center the context tool on the wanted class and select the feature tab. You can then consult the different views of the text of the feature ([[Feature formatters: Basic text view|basic text]] or [[Feature formatters: Flat view|flat]]) and other information such as its [[Callers|callers]] or its [[Descendant versions|descendant]] versions.
-The [[Metric tool: Introduction|metric tool]] provides another kind of data. It enables you to compute some [[How to analyze a project|measures]] on your feature.
+The [[Metrics tool|metric tool]] provides another kind of data. It enables you to compute some [[How to analyze a project|measures]] on your feature.
{{seealso|
[[Looking for a feature|Looking for a feature]] }}
diff --git a/documentation/current/eiffelstudio/eiffelstudio-how-tos/compiling/enabling-profiler.wiki b/documentation/current/eiffelstudio/eiffelstudio-how-tos/compiling/enabling-profiler.wiki
index 449df267..d23eed9c 100644
--- a/documentation/current/eiffelstudio/eiffelstudio-how-tos/compiling/enabling-profiler.wiki
+++ b/documentation/current/eiffelstudio/eiffelstudio-how-tos/compiling/enabling-profiler.wiki
@@ -8,7 +8,7 @@ To profile an executable, the profiler must first be enabled. To enable the prof
* You must [[Generating executables|recompile]] your project for the changes to take effect.
{{seealso|
-[[Profiler wizard: Introduction|Profiler reference]] }}
+[[Profiler wizard]] }}
diff --git a/documentation/current/eiffelstudio/eiffelstudio-how-tos/compiling/tuning-program.wiki b/documentation/current/eiffelstudio/eiffelstudio-how-tos/compiling/tuning-program.wiki
index 5d8dfdc6..fe476a2c 100644
--- a/documentation/current/eiffelstudio/eiffelstudio-how-tos/compiling/tuning-program.wiki
+++ b/documentation/current/eiffelstudio/eiffelstudio-how-tos/compiling/tuning-program.wiki
@@ -18,7 +18,7 @@ Removing the '''Execution Trace''' will optimize the executable in size and spee
All these options are located in the [[Advanced Options|Project Settings]] dialog, in the '''Advanced''' section. They are only effective during finalizations.
{{seealso|
-[[Profiler wizard: Introduction|Profiler reference]] }}
+[[Profiler wizard]] }}
diff --git a/documentation/current/eiffelstudio/eiffelstudio-how-tos/running-and-debugging/profiling.wiki b/documentation/current/eiffelstudio/eiffelstudio-how-tos/running-and-debugging/profiling.wiki
index 5e95c4e3..93624a07 100644
--- a/documentation/current/eiffelstudio/eiffelstudio-how-tos/running-and-debugging/profiling.wiki
+++ b/documentation/current/eiffelstudio/eiffelstudio-how-tos/running-and-debugging/profiling.wiki
@@ -60,7 +60,7 @@ Once the profiler has been enabled and the program has been recompiled, it is ne
When the program exits, a file named 'profinfo' should be generated next to it.
-All that's left to do is launch the [[Profiler wizard: Introduction|Profiler wizard]] and follow the instructions.
+All that's left to do is launch the [[Profiler wizard]] and follow the instructions.
{{seealso|
[[Generating executables|Generating executables]]
diff --git a/documentation/current/eiffelstudio/eiffelstudio-reference/browsing-tools/address-bars/index.wiki b/documentation/current/eiffelstudio/eiffelstudio-reference/browsing-tools/address-bars/index.wiki
index e519e163..82a52123 100644
--- a/documentation/current/eiffelstudio/eiffelstudio-reference/browsing-tools/address-bars/index.wiki
+++ b/documentation/current/eiffelstudio/eiffelstudio-reference/browsing-tools/address-bars/index.wiki
@@ -1,7 +1,7 @@
[[Property:title|Address bars]]
[[Property:weight|1]]
[[Property:uuid|e145c4d3-afd3-653d-cf7c-14fd80f4d566]]
-All development windows are composed of two major components, each of which can be centered on a given "address" (either a cluster, a class or a feature). One is the editor, with which go all the peripheral tools (including the [[Cluster tool|cluster tool]] and the [[Feature tool|feature tool]] ). The other is the context tool, which contains for example the [[Formatters: Introduction|class and feature tabs]] , the [[Diagram tool|diagram tool]] and the [[Metric tool: Introduction|metric tool]] .
+All development windows are composed of two major components, each of which can be centered on a given "address" (either a cluster, a class or a feature). One is the editor, with which go all the peripheral tools (including the [[Cluster tool|cluster tool]] and the [[Feature tool|feature tool]] ). The other is the context tool, which contains for example the [[Formatters: Introduction|class and feature tabs]] , the [[Diagram tool|diagram tool]] and the [[Metrics tool|metric tool]] .
It is possible to either link both components so that they share the same address (allowing to immediately have extended information on the class that is being edited), or to unlink them (allowing to have extended information on any class while editing a class).
diff --git a/documentation/current/eiffelstudio/eiffelstudio-reference/console-tool.wiki b/documentation/current/eiffelstudio/eiffelstudio-reference/console-tool.wiki
index a5ba9e84..8708b95b 100644
--- a/documentation/current/eiffelstudio/eiffelstudio-reference/console-tool.wiki
+++ b/documentation/current/eiffelstudio/eiffelstudio-reference/console-tool.wiki
@@ -31,19 +31,19 @@ Buffer is a way to refer to text of a class, a feature or text/selected text in
* {SOME_CLASS}.some_feature represents text of some_feature from SOME_CLASS
For example, if you run the command:
-{{note| gvim {ANY} }}
+{{sample| gvim {ANY} }}
The text of class ANY will be displayed in a gvim window.
If you run the command:
-{{note| gvim @{ANY} }}
+{{sample| gvim @{ANY} }}
And if class ANY is opened in an editor tab and some text is selected there, the selected text will be displayed in a gvim window.
If you run the command:
-{{note| gvim @{ANY}.is_equal }}
+{{sample| gvim @{ANY}.is_equal }}
The text of feature is_equal from class ANY will be displayed in a gvim window.
If you run the command:
-{{note| gvim -d {ANY}.is_equal {APPLICATION}.is_equal }}
+{{sample| gvim -d {ANY}.is_equal {APPLICATION}.is_equal }}
A gvim windows in diff mode will be opened showing the difference between ANY.is_equal and APPLICATION.is_equal.
The text used in buffer is stored in a temporary file so whatever change done to that text won't affect the text used in EiffelStudio.
diff --git a/documentation/current/eiffelstudio/eiffelstudio-reference/eiffel-information-system/eis-incoming/index.wiki b/documentation/current/eiffelstudio/eiffelstudio-reference/eiffel-information-system/eis-incoming/index.wiki
index 09d0e7c8..0355da49 100644
--- a/documentation/current/eiffelstudio/eiffelstudio-reference/eiffel-information-system/eis-incoming/index.wiki
+++ b/documentation/current/eiffelstudio/eiffelstudio-reference/eiffel-information-system/eis-incoming/index.wiki
@@ -2,9 +2,4 @@
[[Property:weight|3]]
[[Property:uuid|cf25a603-5446-9964-892c-227c4077a829]]
Incoming mechanism is based on URI, and introduces a new URI scheme: '''eiffel'''. By entering the URI into address of a browser, or clicking on the hyper link, an existing EiffelStudio instance or new EiffelStudio instance will try to resolve the URI and display corresponding resources.
-* [[Eiffel Scheme Syntax|Eiffel scheme Syntax]]
-* [[EIS incoming Examples|Examples]]
-
-
-
diff --git a/documentation/current/eiffelstudio/eiffelstudio-reference/eiffel-information-system/index.wiki b/documentation/current/eiffelstudio/eiffelstudio-reference/eiffel-information-system/index.wiki
index d9861a23..c7690811 100644
--- a/documentation/current/eiffelstudio/eiffelstudio-reference/eiffel-information-system/index.wiki
+++ b/documentation/current/eiffelstudio/eiffelstudio-reference/eiffel-information-system/index.wiki
@@ -1,12 +1,19 @@
[[Property:title|Eiffel Information System]]
[[Property:weight|-2]]
[[Property:uuid|7e0394e1-cb31-fae3-79b6-9d1847ef8db7]]
-* [[Eiffel Information System: Introduction|Introduction]]
-* [[EIS: Incoming|Incoming]]
-* [[EIS: Outgoing|Outgoing]]
-** [[Information Tool|Information(EIS) Tool]]
+The Eiffel Information System (EIS) provides a unified mechanism for linking development objects - classes, features and so on - of Eiffel systems with external information. This term refers to information other than Eiffel program texts. Usually the tools maintaining external information are separate tools, such as a browser; we call them external tools. Examples of external information and possible corresponding external tools are:
+* Web page - the default browser
+* PDF document - Acrobat
+EIS is also intended to be the standard mechanism for obtaining help on Eiffel and EiffelStudio, replacing previous solutions. In that case external tools may actually be Eiffel tools.
+The basic mechanisms that EIS makes available to users include two categories: outgoing (from Eiffel to external tools), incoming (the reverse).
+Examples of outgoing mechanisms include:
+* Annotating Eiffel targets, classes and features to include references to external information. Such annotations can include tags.
+* By selecting an annotation in EiffelStudio, automatically open the corresponding external tool to display or edit that information.
+* Provide a list of all external information (in a class, cluster or entire system) corresponding to a specified tag.
+Examples of incoming mechanisms include:
+* For supported tools, select external information linked to an Eiffel developer object and have EiffelStudio directly open on that object. In 6.2, eiffel: schema is supported on Windows.
diff --git a/documentation/current/eiffelstudio/eiffelstudio-reference/eiffelstudio-general-interface-description/eiffelstudio-window-overview.wiki b/documentation/current/eiffelstudio/eiffelstudio-reference/eiffelstudio-general-interface-description/eiffelstudio-window-overview.wiki
index 568bf903..e19787d3 100644
--- a/documentation/current/eiffelstudio/eiffelstudio-reference/eiffelstudio-general-interface-description/eiffelstudio-window-overview.wiki
+++ b/documentation/current/eiffelstudio/eiffelstudio-reference/eiffelstudio-general-interface-description/eiffelstudio-window-overview.wiki
@@ -67,7 +67,7 @@ By default, the context tool is unlinked from the rest of the window, which mean
[[EiffelStudio Editor Introduction|Editor reference]]
[[Formatters: Introduction|Formatted information about compiled classes and features]]
[[Diagram tool: Introduction|Diagram reference]]
-[[Metric tool: Introduction|Metrics reference]] }}
+[[Metrics tool|Metric tool]] }}
diff --git a/documentation/current/eiffelstudio/eiffelstudio-reference/metrics-tool/definitions/attributes-metrics-and-measures.wiki b/documentation/current/eiffelstudio/eiffelstudio-reference/metrics-tool/definitions/attributes-metrics-and-measures.wiki
index d75d15f1..bd0e25f8 100644
--- a/documentation/current/eiffelstudio/eiffelstudio-reference/metrics-tool/definitions/attributes-metrics-and-measures.wiki
+++ b/documentation/current/eiffelstudio/eiffelstudio-reference/metrics-tool/definitions/attributes-metrics-and-measures.wiki
@@ -3,36 +3,33 @@
[[Property:uuid|4e35583c-25e8-63e7-2c11-ea4d3ed2e2a3]]
The most general notion is "attribute":
-{{note| '''Attribute''': An '''attribute''' is a property, qualitative or quantitative, of software products or processes. }}
-
+{{definition|Attribute|An '''attribute''' is a property, qualitative or quantitative, of software products or processes. }}
+
We may distinguish between the product and process cases:
-{{note| '''Product attribute, process attribute''': A '''product attribute''' is an attribute that characterizes a software product or set of products. A '''process attribute''' is an attribute that characterizes a software-related process, such as development, maintenance, documentation, management, or multiple instances of such a process. }}
+{{definition|Product attribute, process attribute|A '''product attribute''' is an attribute that characterizes a software product or set of products. A '''process attribute''' is an attribute that characterizes a software-related process, such as development, maintenance, documentation, management, or multiple instances of such a process. }}
Examples of attributes include reliability (a product attribute, non-quantitative) and total project cost (process, quantitative).
A metric is simply a quantitative attribute:
-{{note| '''Metric''': A '''metric''' is an attribute whose values are numbers (integers or reals), expressed relative to a certain '''unit''' specified as part of the metric definition. }}
+{{definition|Metric|A '''metric''' is an attribute whose values are numbers (integers or reals), expressed relative to a certain '''unit''' specified as part of the metric definition. }}
Examples of metrics include the number of source lines of a program (product) and the total cost of a project (process). The metric tool provides by default a set of metrics, they are available in the Metric Evaluation tab of the metric tool
Attributes other than metrics will be called "qualitative":
-{{note| '''Qualitative attribute''': A '''qualitative attribute''' is an attribute other than a metric. }}
+{{definition|Qualitative attribute|A '''qualitative attribute''' is an attribute other than a metric. }}
An example of qualitative attribute is the reliability of a software product.
The "process" vs. "product" distinction carries over to metrics:
-{{note| '''Product metric, process metric''': A metric is a '''product metric''' if it is a product attribute, a '''process metric''' if it is a process attribute. }}
+{{definition|Product metric, process metric|A metric is a '''product metric''' if it is a product attribute, a '''process metric''' if it is a process attribute. }}
"Relevance", as defined in the previous section, suggests that the purpose of metrics is to help us gain information about attributes that are of direct interest to us. Often these will be qualitative; for example we may want to estimate the reliability of our software. Metrics provide us with numerical values that can serve to assess or predict such attributes.
Applying a metric will give us measures:
-{{note| '''Measure''':A '''measure''' is the value of a metric for a certain process or product. }}
-
-
-
+{{definition|Measure|A '''measure''' is the value of a metric for a certain process or product. }}
diff --git a/documentation/current/eiffelstudio/eiffelstudio-reference/metrics-tool/definitions/criterion-references.wiki b/documentation/current/eiffelstudio/eiffelstudio-reference/metrics-tool/definitions/criterion-references.wiki
index bbfd70b8..fef37366 100644
--- a/documentation/current/eiffelstudio/eiffelstudio-reference/metrics-tool/definitions/criterion-references.wiki
+++ b/documentation/current/eiffelstudio/eiffelstudio-reference/metrics-tool/definitions/criterion-references.wiki
@@ -62,11 +62,11 @@
'''Applicable on:''' Class, Feature
'''Remark:''' This criterion will evaluate to True if candidate class (or feature) is descendant of any (if more than one are possible) of the class (or feature) specified in the criterion domain.
For example, in a class metric,
-{{note|ancestor_is {STRING_8}}}
+{{sample|ancestor_is {STRING_8} }}
will evaluate to True when a candidate class is a descendant of class STRING_8.
In a class metric,
-{{note|ancestor_is {LINKED_LIST, DS_LINKED_LIST} }}
+{{sample|ancestor_is {LINKED_LIST, DS_LINKED_LIST} }}
will evaluate to True when a candidate class is a descendant of either LINKED_LIST or DS_LINKED_LIST.
'''proper_ancestor_is'''
@@ -201,6 +201,7 @@ only_current_verision modifier is a boolean modifier, if it's True, when the cri
'''is_implementors_of'''
'''Syntax:''' is_implementors_of {domain}
'''Applicable on:''' Feature
+
'''Remark:''' This criterion will evaluate to True if the candidate feature is an implementer of some features listed in criterion domain.
diff --git a/documentation/current/eiffelstudio/eiffelstudio-reference/metrics-tool/definitions/index.wiki b/documentation/current/eiffelstudio/eiffelstudio-reference/metrics-tool/definitions/index.wiki
index 60779189..ef5f199d 100644
--- a/documentation/current/eiffelstudio/eiffelstudio-reference/metrics-tool/definitions/index.wiki
+++ b/documentation/current/eiffelstudio/eiffelstudio-reference/metrics-tool/definitions/index.wiki
@@ -1,20 +1,7 @@
[[Property:title|Definitions]]
[[Property:weight|2]]
[[Property:uuid|a562c37f-843c-cbbc-def5-32cda604f269]]
-* [[Definitions: Introduction|Introduction]]
-* [[Attributes, metrics and measures|Attributes, metrics and measures]]
-* [[Units|Units]]
-* [[Metric framework and theory|Metric frame work theory]]
-* [[Elementary and composite metrics|Elementary and composite metrics]]
-* [[Raw metrics and selection criteria|Raw metrics and selection criteria]]
-* [[Selection Criteria|Selection Criterion]]
-* [[Predefined raw metrics|Predefined raw metrics and predefined selection criteria]]
-* [[Scopes|Scopes]]
-* [[Domains|Domains]]
-* [[Measurement archive|Measurement archives]]
-* [[Under the Hood - How metrics work|Under the Hood - How Metrics Work]]
-* [[Criterion References|Selection Criteria Reference]]
-
-
+The metric tool needs a consistent metric theory on which to rely. Indeed, metrics are notoriously subject to abuse and we must be really accurate when defining metrics and related notions.
+This section introduces a set of definitions essential to handle the metric tool.
diff --git a/documentation/current/eiffelstudio/eiffelstudio-reference/metrics-tool/user-interface-basics/index.wiki b/documentation/current/eiffelstudio/eiffelstudio-reference/metrics-tool/user-interface-basics/index.wiki
index 018f9a29..bba98147 100644
--- a/documentation/current/eiffelstudio/eiffelstudio-reference/metrics-tool/user-interface-basics/index.wiki
+++ b/documentation/current/eiffelstudio/eiffelstudio-reference/metrics-tool/user-interface-basics/index.wiki
@@ -1,13 +1,5 @@
[[Property:title|User interface basics]]
[[Property:weight|3]]
[[Property:uuid|c2b8d8b6-661c-1cb5-a991-388e8374c696]]
-EiffelStudio includes a Metric tool based on the previously defined metric theory. This tool provides many facilities like computing measures over a project, including smaller scopes, defining new metrics according to users needs and handling archives to compare projects
-* [[Metric Evaluation Panel|Metric Evaluation panel]]
-* [[Detailed Result Panel|Detailed Result panel]]
-* [[Metric Definition Panel|Metric Definition panel]]
-* [[Metric History Panel|Metric History panel]]
-* [[Metric Archive Panel|Metric Archive panel]]
-
-
-
+EiffelStudio includes a Metric tool based on the previously defined metric theory. This tool provides many facilities like computing measures over a project, including smaller scopes, defining new metrics according to users needs, and handling archives to compare projects.
diff --git a/documentation/current/eiffelstudio/eiffelstudio-reference/metrics-tool/user-interface-basics/metric-definition-panel.wiki b/documentation/current/eiffelstudio/eiffelstudio-reference/metrics-tool/user-interface-basics/metric-definition-panel.wiki
index 9d660548..43b1ae42 100644
--- a/documentation/current/eiffelstudio/eiffelstudio-reference/metrics-tool/user-interface-basics/metric-definition-panel.wiki
+++ b/documentation/current/eiffelstudio/eiffelstudio-reference/metrics-tool/user-interface-basics/metric-definition-panel.wiki
@@ -11,23 +11,40 @@ The following figure shows the layout of the metric definition panel:
[[Image:interface6|Metric definition panel]]
+
Let's have a look at the buttons in the main toolbar which is highlighted in the following figure:
+
[[Image:interface7|Main toolbar buttons]]
-[[Image:metrics-tool--new-metric-icon|New metric]]
-[[Image:metrics-tool--new-document-icon|Clone metric]]
+[[Image:metrics-tool--new-metric-icon|New metric]] New metric
+Use this button to create a new metric. First you need to select a metric type (basic, linear or ratio) and then you may need to select a unit (only for basic and linear metrics). Once a metric is created, its unit cannot be changed.
-[[Image:metrics-tool--general-remove-icon|Remove metric]]
-[[Image:metrics-tool--general-save-icon|Save metric]]
+[[Image:metrics-tool--new-document-icon|Clone metric]] Clone selected metric to a new metric
+If you want to define a new metric but the new metric is quite similar to an existing one, then you can use this button to simplify your work: just clone an existing one and do the modifications.
-[[Image:metrics-tool--command-send-to-external-editor-icon|External editor]]
-[[Image:metrics-tool--general-open-icon|Reload metrics]]
+[[Image:metrics-tool--general-remove-icon|Remove metric]] Remove metric
+Remove current selected metric. This button will be insensitive when the current selected metric is a predefined metric.
+
+
+[[Image:metrics-tool--general-save-icon|Save metric]] Save metric
+To make your newly defined or modified metric take effect, you need to save it first. This button will be insensitive when the current selected metric is a predefined metric.
+
+
+[[Image:metrics-tool--command-send-to-external-editor-icon|External editor]] Open user-defined metric file in external editor
+Metrics are stored in XML format, and this button opens the XML file of user-defined metrics in a an external editor which can be specified in the preferences.
+
+
+[[Image:metrics-tool--general-open-icon|Reload metrics]] Reload metrics
+This button reloads all metrics including predefined and user-defined metrics. It's useful when you modify the metric XML file in an external editor and want the changes to have an effect without restarting EiffelStudio.
+
+
+[[Image:metrics-tool--metric-export-to-file-icon|import]] Import metrics
+This button opens a dialog to backup or import metrics.
-[[Image:metrics-tool--metric-export-to-file-icon|import]]
==Define New Metrics==
diff --git a/documentation/current/eiffelstudio/eiffelstudio-reference/metrics-tool/user-interface-basics/metric-history-panel.wiki b/documentation/current/eiffelstudio/eiffelstudio-reference/metrics-tool/user-interface-basics/metric-history-panel.wiki
index afbd30d4..4c15b595 100644
--- a/documentation/current/eiffelstudio/eiffelstudio-reference/metrics-tool/user-interface-basics/metric-history-panel.wiki
+++ b/documentation/current/eiffelstudio/eiffelstudio-reference/metrics-tool/user-interface-basics/metric-history-panel.wiki
@@ -7,29 +7,43 @@ Lets have a look at the buttons in the main toolbar highlighted in the following
[[Image:interface14|Metric history panel]]
-[[Image:metrics-tool--debug-run-icon|Run history]]
-[[Image:metrics-tool--debug-stop-icon|Stop history]]
+[[Image:metrics-tool--debug-run-icon|Run history]] Recalculate history
Recalculate selected metric history items
-[[Image:metrics-tool--metric-run-and-show-details-icon|Keep detailed result]]
-[[Image:metrics-tool--metric-unit-assertion-icon|Check warning]]
+[[Image:metrics-tool--debug-stop-icon|Stop history]] Stop history recalculation
Stop running metric history recalculation.
-[[Image:metrics-tool--general-reset-icon|Remove detailed result]]
-[[Image:metrics-tool--general-remove-icon|Remove history]]
+[[Image:metrics-tool--metric-run-and-show-details-icon|Keep detailed result]] Keep detailed metric result
+If this option is enabled, the detailed metric result will be kept and will be available after a metric history recalculation.
-[[Image:metrics-tool--metric-group-icon|Show tree]]
-[[Image:interface16|Hide old metrics]]
+[[Image:metrics-tool--metric-unit-assertion-icon|Check warning]] Check metric history warnings
If this option is enabled, specified metric history warnings will be checked.
-[[Image:select-all|select all history]]
-[[Image:deselect-all|deselect all history]]
+[[Image:metrics-tool--general-reset-icon|Remove detailed result]] Remove detailed metric result
Remove detailed metric result, if any.
-[[Image:select-recalculatable|select all calculatable]]
-[[Image:deselect-recalculatable|deselect all calculatable]]
+[[Image:metrics-tool--general-remove-icon|Remove history]] Remove metric history item
Remove selected metric history items.
+
+
+[[Image:metrics-tool--metric-group-icon|Show tree]] Display tree view
If this option is enabled, the metric history items will be displayed in a tree view.
+
+
+[[Image:interface16|Hide old metrics]] Hide old metric history
Hide metric history items which are calculated before the specified number of days
+
+
+[[Image:select-all|select all history]] Select All
Select all recorded metric history items.
+
+
+[[Image:deselect-all|deselect all history]] Deselect All
Deselect all recorded metric history items.
+
+
+[[Image:select-recalculatable|select all calculatable]] Select all recalculatable history items
Select all recalculatable metric history items. A metric history item is recalculatable if its associated metric is valid and its specified input domain is valid.
+
+
+[[Image:deselect-recalculatable|deselect all calculatable]] Deselect all recalculatable history items
Deselect all recalculatable metric history items.
+
==Recalculate Metric History==
diff --git a/documentation/current/eiffelstudio/eiffelstudio-reference/wizards-and-dialogs/index.wiki b/documentation/current/eiffelstudio/eiffelstudio-reference/wizards-and-dialogs/index.wiki
index ef2461df..0658de31 100644
--- a/documentation/current/eiffelstudio/eiffelstudio-reference/wizards-and-dialogs/index.wiki
+++ b/documentation/current/eiffelstudio/eiffelstudio-reference/wizards-and-dialogs/index.wiki
@@ -1,9 +1,5 @@
[[Property:title|Wizards and dialogs]]
[[Property:weight|0]]
[[Property:uuid|b216d12e-20a4-5479-18d2-02e622db5322]]
-* [[Profiler Wizard|Profiler Wizard]]
-* [[Dialogs|Dialogs]]
-
-
diff --git a/documentation/current/eiffelstudio/eiffelstudio-reference/wizards-and-dialogs/profiler-wizard/index.wiki b/documentation/current/eiffelstudio/eiffelstudio-reference/wizards-and-dialogs/profiler-wizard/index.wiki
index 008a381a..31dd9450 100644
--- a/documentation/current/eiffelstudio/eiffelstudio-reference/wizards-and-dialogs/profiler-wizard/index.wiki
+++ b/documentation/current/eiffelstudio/eiffelstudio-reference/wizards-and-dialogs/profiler-wizard/index.wiki
@@ -1,10 +1,21 @@
[[Property:title|Profiler Wizard]]
[[Property:weight|0]]
[[Property:uuid|f3509b1b-8ff1-c385-3bc1-4e800195f8a4]]
-* [[Profiler wizard: Introduction|Introduction]]
-* [[Profiler wizard guided tour|Profiler wizard guided tour]]
-* [[Profiler How To's|Profiler How To's]]
-* [[Profiler wizard reference|Profiler reference]]
+The profiler wizard lets you analyze the result of a profiling session. It helps you optimize your system by pointing out the features where your system spends most of its time.
+
+Before using the profiler wizard you must have generated a ''Run-time information record''. A ''Run-time information record'' is generated by a profiler when a program is executed under its control. Most of the time, the ''Run-time information record'' is generated by the profiler integrated into EiffelStudio. See [[Profiling|How to profile a system]] for more information about how to generate a ''Run-time information record'' with the integrated profiler.
+
+{{note|You can also use a ''Run-time information record'' generated by an external profiler such as GNU's gprof, Pure Atricia's Quantify, Visual C++ profiler, etc. }}
+
+
+
+The diagram below summarizes the execution steps of the profiler wizard.
+
+ [[Image:profiler-process]]
+
+
+{{seealso|
+[[Profiling|How to profile a system]] }}
diff --git a/documentation/current/eiffelstudio/eiffelstudio-reference/wizards-and-dialogs/profiler-wizard/profiler-wizard-guided-tour/index.wiki b/documentation/current/eiffelstudio/eiffelstudio-reference/wizards-and-dialogs/profiler-wizard/profiler-wizard-guided-tour/index.wiki
index 9e3be818..6e27192b 100644
--- a/documentation/current/eiffelstudio/eiffelstudio-reference/wizards-and-dialogs/profiler-wizard/profiler-wizard-guided-tour/index.wiki
+++ b/documentation/current/eiffelstudio/eiffelstudio-reference/wizards-and-dialogs/profiler-wizard/profiler-wizard-guided-tour/index.wiki
@@ -8,7 +8,7 @@
# [[Profile query window|Profile query window]]
{{seealso|
-[[Profiler wizard: Introduction|How the Profiler wizard works]]
+[[Profiler wizard]]
[[Profiling|How to profile a system]] }}
diff --git a/documentation/current/eiffelstudio/eiffelstudio-reference/wizards-and-dialogs/profiler-wizard/profiler-wizard-guided-tour/profile-query-window.wiki b/documentation/current/eiffelstudio/eiffelstudio-reference/wizards-and-dialogs/profiler-wizard/profiler-wizard-guided-tour/profile-query-window.wiki
index 71e1f11a..180f7e09 100644
--- a/documentation/current/eiffelstudio/eiffelstudio-reference/wizards-and-dialogs/profiler-wizard/profiler-wizard-guided-tour/profile-query-window.wiki
+++ b/documentation/current/eiffelstudio/eiffelstudio-reference/wizards-and-dialogs/profiler-wizard/profiler-wizard-guided-tour/profile-query-window.wiki
@@ -18,7 +18,7 @@ Click on the '''Save''' button to save the currently displayed results in a text
[[Image:profiler-query-window]]
{{seealso|
-[[Profiler wizard: Introduction|How the Profiler wizard works]]
+[[Profiler wizard]]
[[Profiling|How to profile a system]] }}
diff --git a/documentation/current/eiffelstudio/eiffelstudio-reference/wizards-and-dialogs/profiler-wizard/profiler-wizard-guided-tour/reuse-or-generate-execution-profile.wiki b/documentation/current/eiffelstudio/eiffelstudio-reference/wizards-and-dialogs/profiler-wizard/profiler-wizard-guided-tour/reuse-or-generate-execution-profile.wiki
index 177a95ac..82b8cac8 100644
--- a/documentation/current/eiffelstudio/eiffelstudio-reference/wizards-and-dialogs/profiler-wizard/profiler-wizard-guided-tour/reuse-or-generate-execution-profile.wiki
+++ b/documentation/current/eiffelstudio/eiffelstudio-reference/wizards-and-dialogs/profiler-wizard/profiler-wizard-guided-tour/reuse-or-generate-execution-profile.wiki
@@ -19,7 +19,7 @@ Clicking '''Next''' will lead you to the [[Select a Run-time information record
{{seealso|
-[[Profiler wizard: Introduction|How the Profiler wizard works]]
+[[Profiler wizard]]
[[Profiling|How to profile a system]] }}
diff --git a/documentation/current/eiffelstudio/eiffelstudio-reference/wizards-and-dialogs/profiler-wizard/profiler-wizard-guided-tour/select-compilation-mode.wiki b/documentation/current/eiffelstudio/eiffelstudio-reference/wizards-and-dialogs/profiler-wizard/profiler-wizard-guided-tour/select-compilation-mode.wiki
index 5bd4f1a9..7833c9f7 100644
--- a/documentation/current/eiffelstudio/eiffelstudio-reference/wizards-and-dialogs/profiler-wizard/profiler-wizard-guided-tour/select-compilation-mode.wiki
+++ b/documentation/current/eiffelstudio/eiffelstudio-reference/wizards-and-dialogs/profiler-wizard/profiler-wizard-guided-tour/select-compilation-mode.wiki
@@ -12,7 +12,7 @@ Clicking '''Next''' will lead you to the [[Reuse or Generate an Execution Profil
{{seealso|
-[[Profiler wizard: Introduction|How the profiler wizard works]] [[Profiling|How to profile a system]] }}
+[[Profiler wizard]]
[[Profiling|How to profile a system]] }}
diff --git a/documentation/current/eiffelstudio/eiffelstudio-reference/wizards-and-dialogs/profiler-wizard/profiler-wizard-guided-tour/select-information-you-need-and-formulate-your-query.wiki b/documentation/current/eiffelstudio/eiffelstudio-reference/wizards-and-dialogs/profiler-wizard/profiler-wizard-guided-tour/select-information-you-need-and-formulate-your-query.wiki
index 45b21e09..a05eb6d3 100644
--- a/documentation/current/eiffelstudio/eiffelstudio-reference/wizards-and-dialogs/profiler-wizard/profiler-wizard-guided-tour/select-information-you-need-and-formulate-your-query.wiki
+++ b/documentation/current/eiffelstudio/eiffelstudio-reference/wizards-and-dialogs/profiler-wizard/profiler-wizard-guided-tour/select-information-you-need-and-formulate-your-query.wiki
@@ -51,7 +51,7 @@ Clicking '''Next''' will open the [[Profile query window|Profile query window]]
{{seealso|
-[[Profiler wizard: Introduction|How the Profiler wizard works]]
+[[Profiler wizard]]
[[Profiling|How to profile a system]] }}
diff --git a/documentation/current/eiffelstudio/eiffelstudio-reference/wizards-and-dialogs/profiler-wizard/profiler-wizard-guided-tour/select-run-time-information-record-generate-execution-profile.wiki b/documentation/current/eiffelstudio/eiffelstudio-reference/wizards-and-dialogs/profiler-wizard/profiler-wizard-guided-tour/select-run-time-information-record-generate-execution-profile.wiki
index 761c8ead..8074d489 100644
--- a/documentation/current/eiffelstudio/eiffelstudio-reference/wizards-and-dialogs/profiler-wizard/profiler-wizard-guided-tour/select-run-time-information-record-generate-execution-profile.wiki
+++ b/documentation/current/eiffelstudio/eiffelstudio-reference/wizards-and-dialogs/profiler-wizard/profiler-wizard-guided-tour/select-run-time-information-record-generate-execution-profile.wiki
@@ -18,7 +18,7 @@ Clicking '''Next''' will lead you to the [[Select the information you need and f
{{seealso|
-[[Profiler wizard: Introduction|How the Profiler wizard works]]
+[[Profiler wizard]]
[[Profiling|How to profile a system]]
[[How to set up a Profiler Configuration File|How to set up a Profiler Configuration File]] }}