diff --git a/documentation/current/community/index.wiki b/documentation/current/community/index.wiki
index 66e76bb5..8a1bebc6 100644
--- a/documentation/current/community/index.wiki
+++ b/documentation/current/community/index.wiki
@@ -18,5 +18,5 @@ Community input is welcome. If you are interested in improving and developing Ei
 
 To become a contributor, you should be proficient in Eiffel technology and have good written English skills. To become an editor, you should already be a contributor and have contributed significant improvements or additions to the documentation.
 
-If you are interested in becoming a contributor, please [http://doc.eiffel.com/contact contact us] or send an email to info@eiffel.com with a short description of your Eiffel experience and any other relevant background.
+If you are interested in becoming a contributor, you can [/user/register register] for an account, and then please [/contact contact us] with a short description of your Eiffel experience and any other relevant background.
 
diff --git a/documentation/current/eiffelstudio/eiffelstudio-how-tos/browsing/viewing-information-about-component/centering-tools-component.wiki b/documentation/current/eiffelstudio/eiffelstudio-how-tos/browsing/viewing-information-about-component/centering-tools-component.wiki
index 204ad378..db7b555b 100644
--- a/documentation/current/eiffelstudio/eiffelstudio-how-tos/browsing/viewing-information-about-component/centering-tools-component.wiki
+++ b/documentation/current/eiffelstudio/eiffelstudio-how-tos/browsing/viewing-information-about-component/centering-tools-component.wiki
@@ -1,7 +1,7 @@
 [[Property:title|Centering tools on a component]]
 [[Property:weight|0]]
 [[Property:uuid|513b0d4a-78b6-30c3-fdde-b00c3072d8d3]]
-There are three kind of tools directly available in a default development tool : [[Browsing tools|browsing tools]]  on the left, the [[EiffelStudio Editor Introduction|editor]]  on the upper right and context tools on the lower right. No browsing tool, except the feature tool, displays information about a particular component. On the contrary, the editor and context tools display information about a given cluster, class or feature : they are centered on this component. There are several ways to center the editor on an element: 
+There are three kind of tools directly available in a default development tool : [[Browsing tools]]  on the left, the [[EiffelStudio Editor]]  on the upper right and context tools on the lower right. No browsing tool, except the feature tool, displays information about a particular component. On the contrary, the editor and context tools display information about a given cluster, class or feature : they are centered on this component. There are several ways to center the editor on an element: 
 * use the [[Main address bar|address bar]]  on the top of the editor. It allows you to set which class (and even which feature in the class) you want the editor to display. You may use wildcards ("?" or "*") as you type the names of these components. 
 * use [[Pick-and-drop mechanism|pick and drop]]. Pick a cluster, class or feature stone anywhere in EiffelStudio and drop it in the editor. It will center it on the component automatically. 
 * find it in the [[Cluster tool|cluster]], [[Feature tool|feature]], or [[Favorites tool|favorites]]  tool and click it. 
diff --git a/documentation/current/eiffelstudio/eiffelstudio-how-tos/customizing-eiffelstudio/making-context-tool-independent-editor.wiki b/documentation/current/eiffelstudio/eiffelstudio-how-tos/customizing-eiffelstudio/making-context-tool-independent-editor.wiki
index bb6c700c..ffd0a7f9 100644
--- a/documentation/current/eiffelstudio/eiffelstudio-how-tos/customizing-eiffelstudio/making-context-tool-independent-editor.wiki
+++ b/documentation/current/eiffelstudio/eiffelstudio-how-tos/customizing-eiffelstudio/making-context-tool-independent-editor.wiki
@@ -1,7 +1,7 @@
 [[Property:title|Making the context tool independent from the editor]]
 [[Property:weight|3]]
 [[Property:uuid|895ca03f-b14c-e0c5-f3e7-6757b47f5bc3]]
-By default, [[EiffelStudio Editor Introduction|the editor]]  and the [[EiffelStudio window overview|context tool]]  are [[Centering tools on a component|centered]]  on the same cluster, class or feature. It is possible to make the context tool independent from the editor. It has then its own address bar and can display information on a totally different component than the one on which the editor is centered. 
+By default, the [[EiffelStudio Editor]] and the [[EiffelStudio window overview|context tool]]  are [[Centering tools on a component|centered]]  on the same cluster, class or feature. It is possible to make the context tool independent from the editor. It has then its own address bar and can display information on a totally different component than the one on which the editor is centered. 
 To do so, click on or select '''Isolate context tool''' in the '''View''' menu. To go back to the previous configuration, click on the same icon again or select '''Merge context tool''' in the '''View''' menu. 
 
 You can also modify the [[EiffelStudio preferences]] so that next time a window is opened, its context tool will be automatically independent: open the [[Preference window overview|preferences window]]  by choosing '''Preferences...''' in the '''Tools''' menu. Select then the "context tool" sub-category in the "Tools" of the preferences tree. Lastly click on "Share addresses between the editor and the context tool" and set it to '''False'''. <br/>
diff --git a/documentation/current/eiffelstudio/eiffelstudio-how-tos/customizing-eiffelstudio/setting-editor-behavior.wiki b/documentation/current/eiffelstudio/eiffelstudio-how-tos/customizing-eiffelstudio/setting-editor-behavior.wiki
index 2f0d1a19..2d41a775 100644
--- a/documentation/current/eiffelstudio/eiffelstudio-how-tos/customizing-eiffelstudio/setting-editor-behavior.wiki
+++ b/documentation/current/eiffelstudio/eiffelstudio-how-tos/customizing-eiffelstudio/setting-editor-behavior.wiki
@@ -1,7 +1,7 @@
 [[Property:title|Setting the editor behavior]]
 [[Property:weight|0]]
 [[Property:uuid|ff77b886-4a47-2ba4-eac7-ae051934a3f5]]
-Some of [[EiffelStudio Editor Introduction|the editor]]  properties are customizable. [[Automatic completion: Introduction|Automatic completion]] , for instance, can be partially or totally disabled, and inserted strings can be defined by the user. Some accelerators are customizable too. For more information, please refer to the [[Editor Preferences|editor preferences reference]] . 
+Some of the [[EiffelStudio Editor]] properties are customizable. [[Automatic completion]], for instance, can be partially or totally disabled, and inserted strings can be defined by the user. Some accelerators are customizable too. For more information, please refer to the [[Editor Preferences|editor preferences reference]] . 
 {{seealso|<br/>
 [[Changing texts display|Text colors and font customization.]]  }}
 
diff --git a/documentation/current/eiffelstudio/eiffelstudio-reference/browsing-tools/search-tool.wiki b/documentation/current/eiffelstudio/eiffelstudio-reference/browsing-tools/search-tool.wiki
index 24b0653c..b6a81e9a 100644
--- a/documentation/current/eiffelstudio/eiffelstudio-reference/browsing-tools/search-tool.wiki
+++ b/documentation/current/eiffelstudio/eiffelstudio-reference/browsing-tools/search-tool.wiki
@@ -18,26 +18,21 @@ The bottom part contains two buttons: "Search" and "Replace". Click on the first
 ==Options==
 
 The options are located in the middle of the search panel. There are five buttons, each of them corresponding to an option:
-*  
-Match case: If this option is selected, the search will be case-sensitive, which means that if you search for "example", the tool will highlight "example" but not "EXAMPLE" or "Example", as there are no capital letters in the searched pattern.
+
+*  Match case: If this option is selected, the search will be case-sensitive, which means that if you search for "example", the tool will highlight "example" but not "EXAMPLE" or "Example", as there are no capital letters in the searched pattern.
 
 * Whole word: If this option is selected, the tool will look for isolated words. A word is isolated if it is surrounded by spaces or if it is at the beginning or the end of a line.
-*  
-Use wildcards: If this option is not selected, the tool will look for the exact sequence of letters you entered in the "Search for" field. If it is selected, you will be able to use '*' and '?'wildcards. '?' in the searched pattern is equivalent to any character. For instance, "sample" and "simple" will be highlighted if you look for "s?mple". <br/>
-'*' is equivalent to any sequence of characters, including no characters at all. It means that if you search for "exam*ple", every piece of text beginning with "exam" and finishing with "ple" will be highlighted. Use it in combination with "Whole word" to search for words beginning with "exam" and finishing with "ple". 
+*  Use wildcards: If this option is not selected, the tool will look for the exact sequence of letters you entered in the "Search for" field. If it is selected, you will be able to use '*' and '?' wildcards. '?' in the searched pattern is equivalent to any character. For instance, "sample" and "simple" will be highlighted if you look for "s?mple". '*' is equivalent to any sequence of characters, including no characters at all. It means that if you search for "exam*ple", every piece of text beginning with "exam" and finishing with "ple" will be highlighted. Use it in combination with "Whole word" to search for words beginning with "exam" and finishing with "ple". 
 
-*  
-Replace all: If it is selected when you press the "Replace" button, every occurrence of the searched pattern will be replaced with the content of the "Replace with" field. It is possible to activate this option only if the "Replace with" field is displayed.
+*  Replace all: If it is selected when you press the "Replace" button, every occurrence of the searched pattern will be replaced with the content of the "Replace with" field. It is possible to activate this option only if the "Replace with" field is displayed.
 
-*  
-Search backwards: If this option is selected, the tool will highlight the previous occurrence of the searched pattern instead of the next occurrence when you press the "Search" button.
+*  Search backwards: If this option is selected, the tool will highlight the previous occurrence of the searched pattern instead of the next occurrence when you press the "Search" button.
 
 
-'''Note''': If the search tool hits one end of the text, it will automatically continue from the other end. <br/>
+{{note|If the search tool hits one end of the text, it will automatically continue from the other end. }}
 
 
-{{seealso|<br/>
-There are keyboard shortcuts and menu entries to launch searches without using the search tool directly. They are described the [[Search functionality|editor section]]  of this help. }}
+{{seealso|The [[Search functionality]] part of the EiffelStudio Editor section to learn keyboard shortcuts and menu entries to launch searches without using the search tool directly.  }}
 
 
 
diff --git a/documentation/current/eiffelstudio/eiffelstudio-reference/browsing-tools/windows-tool/index.wiki b/documentation/current/eiffelstudio/eiffelstudio-reference/browsing-tools/windows-tool/index.wiki
index 79081c25..9deb10a7 100644
--- a/documentation/current/eiffelstudio/eiffelstudio-reference/browsing-tools/windows-tool/index.wiki
+++ b/documentation/current/eiffelstudio/eiffelstudio-reference/browsing-tools/windows-tool/index.wiki
@@ -1,10 +1,15 @@
 [[Property:title|Windows tool]]
 [[Property:weight|5]]
 [[Property:uuid|57b14a4b-8694-12f6-06c8-24411e331559]]
-*  [[Windows tool: Introduction|Introduction]]  
-*  [[Window list|Window list]]  
-*  [[Window menu|Window menu]]  
-*  [[Window related commands|Window related commands]]  
+The windows tool (  [[Image:windows-windows-icon]] ) gives a list of opened development windows. 
+
+[[Image:windows-tool]]  
+
+Its main component is the [[Window list|Window list]] . 
+
+It is also linked to the [[Window menu|Window menu]]  menu. 
+
+[[Window related commands|Window related commands]] provide global management of windows.
 
 
 
diff --git a/documentation/current/eiffelstudio/eiffelstudio-reference/eiffelstudio-editor/automatic-completion/class-name-auto-complete.wiki b/documentation/current/eiffelstudio/eiffelstudio-reference/eiffelstudio-editor/automatic-completion/class-name-auto-complete.wiki
index 9ccf1315..b0e2c1fc 100644
--- a/documentation/current/eiffelstudio/eiffelstudio-reference/eiffelstudio-editor/automatic-completion/class-name-auto-complete.wiki
+++ b/documentation/current/eiffelstudio/eiffelstudio-reference/eiffelstudio-editor/automatic-completion/class-name-auto-complete.wiki
@@ -1,14 +1,21 @@
 [[Property:title|Class name auto complete]]
 [[Property:weight|3]]
 [[Property:uuid|0f11a078-7dab-54d1-b624-4c04476564a5]]
-EiffelStudio editor offers the possibility to complete class names automatically. This means that when the user types " ''a_variable: AN_INCOMPLETE_CLASS_NAME''" and then triggers the auto-complete, the editor will propose a list of possible valid class names. <br/>
+The EiffelStudio editor will complete class names automatically. This means that when the user types:
+<code>
+    a_variable: AN_INCOMPLETE_CLASS_NAME</code>
+and then triggers the auto-complete, the editor will propose a list of possible valid class names. <br/>
 To be more precise, a window will pop up and display the list of classes that match ''AN_INCOMPLETE_CLASS_NAME''. The user can accept the suggested name, choose another name (in the list or not), or simply cancel the auto-complete. 
 
+
 [[Image:editor-class-auto-completion-window]]  
 
+
 To trigger the auto complete, press the key combination "Ctrl+Shift+Space" or click on '''Complete class name''' in the '''Advanced''' sub-menu of the  [[Edit menu commands|menu]] . If automatic completion is possible, there are two cases : if only one name matches, this name will be inserted in the editor. If there are no matching names or several ones a window will appear. This window will contain a text field and a list. The text field will be filled with the beginning of the class name that was entered. The first item in the list, if any, will be selected. <br/>
 To complete your code with the selected item, press "Enter" or "Ctrl+Space". <br/>
+
 To choose another item, use keyboard Up and Down arrows or the mouse. You can also modify the content of the text field. The list will be updated automatically. To validate your choice, press "Enter" or "Ctrl+Space". If there is no selected item, the content of the text field will be inserted. <br/>
+
 To cancel the auto-complete, press "Esc" at any time. 
 
 
diff --git a/documentation/current/eiffelstudio/eiffelstudio-reference/eiffelstudio-editor/automatic-completion/feature-call-auto-complete.wiki b/documentation/current/eiffelstudio/eiffelstudio-reference/eiffelstudio-editor/automatic-completion/feature-call-auto-complete.wiki
index 0baddc7a..f35d0a88 100644
--- a/documentation/current/eiffelstudio/eiffelstudio-reference/eiffelstudio-editor/automatic-completion/feature-call-auto-complete.wiki
+++ b/documentation/current/eiffelstudio/eiffelstudio-reference/eiffelstudio-editor/automatic-completion/feature-call-auto-complete.wiki
@@ -1,23 +1,30 @@
 [[Property:title|Feature call auto complete]]
 [[Property:weight|2]]
 [[Property:uuid|40ae30a6-c033-dae7-8dae-2569e7ba0adc]]
-EiffelStudio editor now offers the possibility to complete feature calls automatically. This means that when the user types " ''an_identifier.an_incomplete_feature_name''" and then triggers the auto-complete, the editor will propose a list of possible feature names correct in this situation. <br/>
-To be more precise, a window will pop up and display the list of features that can be called on ''an_identifier'' and that match ''an_incomplete_feature_name''. The user can accept the suggested name, choose another name (in the list or not), or simply cancel the auto-complete. 
+EiffelStudio editor will complete feature calls automatically. 
+
+This means that when the user types:
+<code>
+            an_identifier.an_incomplete_feature_name</code> 
+and then triggers the auto-complete, the editor will propose a list of possible feature names correct in this situation. <br/>
+To be more precise, a window will pop up and display the list of features that can be called on <code>an_identifier</code> and that match <code>an_incomplete_feature_name</code>. The user can accept the suggested name, choose another name (in the list or not), or simply cancel the auto-complete. 
+
 
 [[Image:editor-auto-completion-window]]  
 
+
 To trigger the auto complete, press the key combination "Ctrl+Space" or click on '''Complete word''' in the '''Advanced''' sub-menu of the  [[Edit menu commands|menu]] . If automatic completion is possible, there are two cases : if only one name matches, this name will be inserted in the editor. If there are no matching names or several ones a window will appear. This window will contain a text field and a list. The text field will be filled with the beginning of the feature name that was entered. The first item in the list, if any, will be selected. <br/>
 To complete your code with the selected item, press "Enter" or "Ctrl+Space". <br/>
 To choose another item, use keyboard Up and Down arrows or the mouse. You can also modify the content of the text field. The list will be updated automatically. To validate your choice, press "Enter" or "Ctrl+Space". If there is no selected item, the content of the text field will be inserted. <br/>
 To cancel the auto-complete, press "Esc" at any time. 
 
-{{tip|s''': }}
+{{tip|The following tips can help you get the most out of feature call automatic completion: }}
 * If the selected feature is a query, you can call the auto-complete again right after the previous completion. There is no need to type a dot.
 * You can call the auto-complete without an identifier. The auto-complete window will then show the features of the current class.
 * The keyboard shortcut for automatic completion can be changed in the [[Keyboard shortcuts preferences|editor preferences]] . 
 * Typing a non-alphanumeric character in the completion window automatically closes it. You can therefore type '.', ' ' or '(' to close the completion window and start typing the next token straight away.
 
-{{note|s''': }}
+{{note|There are just a few more things you should know about feature call automatic completion: }}
 * Only identifiers that were already defined when the class was compiled for the last time can be completed, except for local entity names that can always be completed.
 * Only compiled features will appear in the auto-complete window.
 * By default, features from class ANY will be ignored by the auto-complete window. This can be changed in the [[General Editor Preferences|editor preferences]] . 
diff --git a/documentation/current/eiffelstudio/eiffelstudio-reference/eiffelstudio-editor/automatic-completion/index.wiki b/documentation/current/eiffelstudio/eiffelstudio-reference/eiffelstudio-editor/automatic-completion/index.wiki
index 1a843a6b..79aec32a 100644
--- a/documentation/current/eiffelstudio/eiffelstudio-reference/eiffelstudio-editor/automatic-completion/index.wiki
+++ b/documentation/current/eiffelstudio/eiffelstudio-reference/eiffelstudio-editor/automatic-completion/index.wiki
@@ -1,11 +1,13 @@
 [[Property:title|Automatic completion]]
 [[Property:weight|6]]
 [[Property:uuid|eb89d090-6998-7dbe-6430-26d30eb87a32]]
-*  [[Automatic completion: Introduction|Introduction]]  
-*  [[Syntax auto complete|Syntax auto-complete]]  
-*  [[Feature call auto complete|Feature call auto-complete]]  
-*  [[Class name auto complete|Class name auto-complete]]  
-
+EiffelStudio editor includes new features designed to help write Eiffel code. Automatic completion is one of those. This feature is available in three contexts:
+
+*  [[Syntax auto complete]]: when the user types some expression defined in the Eiffel language. 
+*  [[Feature call auto complete]]: when the user enters a feature call.
+*  [[Class name auto complete]]: when the user enters a class name. 
+
+This feature is can be customized or disabled in the [[Editor Preferences]]. 
 
 
 
diff --git a/documentation/current/eiffelstudio/eiffelstudio-reference/eiffelstudio-editor/automatic-completion/syntax-auto-complete.wiki b/documentation/current/eiffelstudio/eiffelstudio-reference/eiffelstudio-editor/automatic-completion/syntax-auto-complete.wiki
index 47192cbb..99cc891c 100644
--- a/documentation/current/eiffelstudio/eiffelstudio-reference/eiffelstudio-editor/automatic-completion/syntax-auto-complete.wiki
+++ b/documentation/current/eiffelstudio/eiffelstudio-reference/eiffelstudio-editor/automatic-completion/syntax-auto-complete.wiki
@@ -2,12 +2,11 @@
 [[Property:weight|1]]
 [[Property:uuid|aafa7c51-7a4d-385d-9c34-5e9dbba075fe]]
 Syntax auto-complete in EiffelStudio editor is twofold :
-*  
-The editor can close brackets ("(", "{" and "[") and quotes(""", "'" and "`") automatically. This feature is disabled by default. It can be activated in the editor preferences.
 
-*  
-The editor can complete syntactic structures or part of them. The auto-complete is triggered when "Enter" or "Space" keys are pressed after a reserved word included in the following list:
-{| 
+*  The editor can close brackets ("(", "{" and "[") and quotes(""", "'" and "`") automatically. This feature is disabled by default. It can be activated in the editor preferences.
+
+*  The editor can complete syntactic structures or part of them. The auto-complete is triggered when "Enter" or "Space" keys are pressed after a reserved word included in the following list:
+{| align="center"
 |- 
 | class
 | ensure
@@ -58,12 +57,9 @@ The editor can complete syntactic structures or part of them. The auto-complete
 | require
 |}
 
-The way these reserved words are completed is fully [[Syntax automatic completion preferences|customizable]] . 
 
 
-{{seealso|<br/>
-To see how the editor completes by default and how it can be changed, please read the following pages: [[Syntax automatic completion preferences|Syntax auto-complete preferences]]  <br/>
-}}
+{{seealso|How the editor completes by default and how the default behavior can be changed, documented in the [[Syntax automatic completion preferences]]  }}
 
 
 
diff --git a/documentation/current/eiffelstudio/eiffelstudio-reference/eiffelstudio-editor/clipboard-functionality.wiki b/documentation/current/eiffelstudio/eiffelstudio-reference/eiffelstudio-editor/clipboard-functionality.wiki
index b78a7f52..3c970da3 100644
--- a/documentation/current/eiffelstudio/eiffelstudio-reference/eiffelstudio-editor/clipboard-functionality.wiki
+++ b/documentation/current/eiffelstudio/eiffelstudio-reference/eiffelstudio-editor/clipboard-functionality.wiki
@@ -2,14 +2,12 @@
 [[Property:weight|3]]
 [[Property:uuid|f1bd2fd2-c115-d4e8-cb3b-2118f25037bb]]
 EiffelStudio editor provides common clipboard functionality, i.e. Cut, Copy and Paste commands.
-*  
-To copy text to the clipboard, [[Selection|select]]  it in the editor first. Then, you may either press the key combination "Ctrl+C" (or "Shift+Ins"), click on the copy icon  [[Image:16x16--general-copy-icon]] or choose '''Copy''' in the '''Edit''' menu. 
 
-*  
-To cut text, i.e. copy it to the clipboard and delete it, [[Selection|select]]  it and then either press "Ctrl+X" (or "Shift+Del"), click on the cut icon  [[Image:general-cut-icon]] or choose '''Cut''' in the '''Edit''' menu. 
+*  To copy text to the clipboard, [[Selection|select]]  it in the editor first. Then, you may either press the key combination "Ctrl+C" (or "Shift+Ins"), click on the copy icon  [[Image:16x16--general-copy-icon]] or choose '''Copy''' in the '''Edit''' menu. 
 
-*  
-To paste text from the clipboard, either press "Ctrl+V" (or"Ctrl+Ins"), click on the paste icon  [[Image:general-paste-icon]] or choose '''Paste''' in the '''Edit''' menu. 
+*  To cut text, i.e. copy it to the clipboard and delete it, [[Selection|select]]  it and then either press "Ctrl+X" (or "Shift+Del"), click on the cut icon  [[Image:general-cut-icon]] or choose '''Cut''' in the '''Edit''' menu. 
+
+*  To paste text from the clipboard, either press "Ctrl+V" (or"Ctrl+Ins"), click on the paste icon  [[Image:general-paste-icon]] or choose '''Paste''' in the '''Edit''' menu. 
 
 
 
diff --git a/documentation/current/eiffelstudio/eiffelstudio-reference/eiffelstudio-editor/editor-customization.wiki b/documentation/current/eiffelstudio/eiffelstudio-reference/eiffelstudio-editor/editor-customization.wiki
index b7754077..b9565022 100644
--- a/documentation/current/eiffelstudio/eiffelstudio-reference/eiffelstudio-editor/editor-customization.wiki
+++ b/documentation/current/eiffelstudio/eiffelstudio-reference/eiffelstudio-editor/editor-customization.wiki
@@ -1,7 +1,7 @@
 [[Property:title|Editor customization]]
 [[Property:weight|9]]
 [[Property:uuid|650993e4-65a7-9a7e-7d08-b4c17c14ff39]]
-Many of the editor features, the [[Automatic completion: Introduction|automatic completion]]  in particular, can be customized in the preferences. <br/>
+Many of the editor features, the [[automatic completion]] in particular, can be customized in the preferences. <br/>
 Please refer to the [[Editor Preferences|editor section]]  of the preferences help for more details. 
 
 
diff --git a/documentation/current/eiffelstudio/eiffelstudio-reference/eiffelstudio-editor/history-functionality.wiki b/documentation/current/eiffelstudio/eiffelstudio-reference/eiffelstudio-editor/history-functionality.wiki
index 6bc9630e..d16cc3b4 100644
--- a/documentation/current/eiffelstudio/eiffelstudio-reference/eiffelstudio-editor/history-functionality.wiki
+++ b/documentation/current/eiffelstudio/eiffelstudio-reference/eiffelstudio-editor/history-functionality.wiki
@@ -2,11 +2,10 @@
 [[Property:weight|4]]
 [[Property:uuid|04edcfb7-3a63-e9e6-2ac6-8f5868b3ee10]]
 EiffelStudio editor provides an history functionality, i.e. Undo and Redo commands.
-*  
-To undo last change, press the key combination "Ctrl+Z", click on the undo icon  [[Image:general-undo-icon]] or choose '''Undo''' in the '''Edit''' menu. If you repeat this operation, the editor will undo the last change and so on until there are no more changes to undo. 
 
-*  
-To redo last undone change, press the key combination "Ctrl+Y", click on the redo icon  [[Image:general-redo-icon]] or choose '''Redo''' in the '''Edit''' menu. If you repeat this operation, the editor will redo the last undone change and so on until there are no undone changes left. 
+*  To undo last change, press the key combination "Ctrl+Z", click on the undo icon  [[Image:general-undo-icon]] or choose '''Undo''' in the '''Edit''' menu. If you repeat this operation, the editor will undo the last change and so on until there are no more changes to undo. 
+
+*  To redo last undone change, press the key combination "Ctrl+Y", click on the redo icon  [[Image:general-redo-icon]] or choose '''Redo''' in the '''Edit''' menu. If you repeat this operation, the editor will redo the last undone change and so on until there are no undone changes left. 
 
 
 
diff --git a/documentation/current/eiffelstudio/eiffelstudio-reference/eiffelstudio-editor/index.wiki b/documentation/current/eiffelstudio/eiffelstudio-reference/eiffelstudio-editor/index.wiki
index 4a001d8e..afcf491b 100644
--- a/documentation/current/eiffelstudio/eiffelstudio-reference/eiffelstudio-editor/index.wiki
+++ b/documentation/current/eiffelstudio/eiffelstudio-reference/eiffelstudio-editor/index.wiki
@@ -2,16 +2,11 @@
 [[Property:link_title|Editor]]
 [[Property:weight|-12]]
 [[Property:uuid|2594094b-af66-8cea-1d7f-629157c4aafa]]
-*  [[EiffelStudio Editor Introduction|Introduction]]  
-*  [[Cursor moves|Cursor moves]]  
-*  [[Selection|Selection]]  
-*  [[Clipboard functionality|Clipboard functionality]]  
-*  [[History functionality|History functionality]]  
-*  [[Search functionality|Search functionality]]  
-*  [[Automatic completion|Automatic completion]]  
-*  [[Operations on text blocks|Operations on text blocks]]  
-*  [[Edit menu commands|Commands in the edit menu]]  
-*  [[Editor customization|Customization]]  
+EiffelStudio includes an editor which allows you to read and modify the text of Eiffel classes.
+
+The EiffelStudio editor offers usual [[Clipboard functionality]], [[History functionality]], and [[Search functionality]]. More advanced, class text specific functionalities such as [[Automatic completion]] and [[Operations on text blocks]] are also available. 
+
+
 
 
 
diff --git a/documentation/current/eiffelstudio/eiffelstudio-reference/eiffelstudio-editor/search-functionality.wiki b/documentation/current/eiffelstudio/eiffelstudio-reference/eiffelstudio-editor/search-functionality.wiki
index 2d6ab459..d3890e2a 100644
--- a/documentation/current/eiffelstudio/eiffelstudio-reference/eiffelstudio-editor/search-functionality.wiki
+++ b/documentation/current/eiffelstudio/eiffelstudio-reference/eiffelstudio-editor/search-functionality.wiki
@@ -2,21 +2,14 @@
 [[Property:weight|5]]
 [[Property:uuid|eecef577-ac83-610c-9ffd-cb20c4002346]]
 EiffelStudio editor provides a search functionality. To search an expression in the edited text, you can either use the [[Search tool|Search tool]]  or use a set of keyboard accelerators available directly from the editor. From the editor, you can: 
-*  
-Search the next occurrence of the last searched pattern. <br/>
-To do so, press "F3". You can change this key binding in [[Keyboard shortcuts preferences|the preferences]] . 
 
-*  
-Search the previous occurrence of the last searched pattern. <br/>
-To do so, press "Shift+F3". You can change this key binding in [[Keyboard shortcuts preferences|the preferences]] . 
+*  Search the next occurrence of the last searched pattern. To do so, press "F3". You can change this key binding in [[Keyboard shortcuts preferences|the preferences]] . 
 
-*  
-Search the next occurrence of the current selected pattern. <br/>
-To do so, press "Ctrl+F3". You can change this key binding in [[Keyboard shortcuts preferences|the preferences]] . 
+*  Search the previous occurrence of the last searched pattern. To do so, press "Shift+F3". You can change this key binding in [[Keyboard shortcuts preferences|the preferences]] . 
 
-*  
-Search the previous occurrence of the current selected pattern. <br/>
-To do so, press "Ctrl+Shift+F3". You can change this key binding in [[Keyboard shortcuts preferences|the preferences]] . 
+*  Search the next occurrence of the current selected pattern. To do so, press "Ctrl+F3". You can change this key binding in [[Keyboard shortcuts preferences|the preferences]] . 
+
+*  Search the previous occurrence of the current selected pattern. To do so, press "Ctrl+Shift+F3". You can change this key binding in [[Keyboard shortcuts preferences|the preferences]] . 
 
 
 {{seealso|<br/>
diff --git a/documentation/current/eiffelstudio/eiffelstudio-reference/eiffelstudio-general-interface-description/eiffelstudio-interface-mechanisms/pick-and-drop-shortcut.wiki b/documentation/current/eiffelstudio/eiffelstudio-reference/eiffelstudio-general-interface-description/eiffelstudio-interface-mechanisms/pick-and-drop-shortcut.wiki
index e12b0af9..d82f7c63 100644
--- a/documentation/current/eiffelstudio/eiffelstudio-reference/eiffelstudio-general-interface-description/eiffelstudio-interface-mechanisms/pick-and-drop-shortcut.wiki
+++ b/documentation/current/eiffelstudio/eiffelstudio-reference/eiffelstudio-general-interface-description/eiffelstudio-interface-mechanisms/pick-and-drop-shortcut.wiki
@@ -1,7 +1,7 @@
 [[Property:title|Pick-and-drop shortcut]]
 [[Property:weight|1]]
 [[Property:uuid|2cb70fcf-913c-0b74-d2a9-5928caa5904a]]
-In the [[EiffelStudio Editor Introduction|editor]]  and the [[EiffelStudio window overview|context tool]] , pressing the '''control''' key while right-clicking on a development object opens a new development window which is centered on the clicked object. 
+In the [[EiffelStudio Editor]] and the [[EiffelStudio window overview|context tool]] , pressing the '''control''' key while right-clicking on a development object opens a new development window which is centered on the clicked object. 
 
 {{tip|The effect of control-picking is now configurable in the [[Preferences Reference|preferences]] . }}
 
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 0ed0757b..73a11a10 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
@@ -64,7 +64,7 @@ By default, the context tool is unlinked from the rest of the window, which mean
 [[EiffelStudio: A Guided Tour|EiffelStudio Guided Tour]]  <br/>
 [[Browsing tools|Browsing tools]]  <br/>
 [[Main toolbars|Toolbar customization]]  <br/>
-[[EiffelStudio Editor Introduction|Editor reference]]  <br/>
+[[EiffelStudio Editor]]  <br/>
 [[Formatted information about compiled classes and features]]  <br/>
 [[Diagram tool: Introduction|Diagram reference]]  <br/>
 [[Metrics tool|Metric tool]]  }}
diff --git a/documentation/current/eiffelstudio/eiffelstudio-reference/eiffelstudio-general-interface-description/main-toolbars.wiki b/documentation/current/eiffelstudio/eiffelstudio-reference/eiffelstudio-general-interface-description/main-toolbars.wiki
index 5d65d460..91a5ec4f 100644
--- a/documentation/current/eiffelstudio/eiffelstudio-reference/eiffelstudio-general-interface-description/main-toolbars.wiki
+++ b/documentation/current/eiffelstudio/eiffelstudio-reference/eiffelstudio-general-interface-description/main-toolbars.wiki
@@ -6,7 +6,7 @@ At the top of a development window, two toolbars are displayed by default. They
 
 You can hide toolbars (or the address bar) by unselecting them in the '''Toolbars''' sub-menu of the '''View''' menu or in the context menu that you can get by right-clicking in the empty space on the right of the bars. If you want them to be displayed again, just select them in the '''Toolbars''' sub-menu of the '''View''' menu. 
 
-In the standard toolbar, you will find buttons to manage [[Browsing tools|tools]]  and windows or that are related to the [[EiffelStudio Editor Introduction|editor]] . <br/>
+In the standard toolbar, you will find buttons to manage [[Browsing tools|tools]]  and windows or that are related to the [[EiffelStudio Editor]] . <br/>
 
 
 {{note|For both toolbars, it is possible to choose which buttons are displayed and which ones are not. See the [[Toolbar customization|Toolbars customization page]]  for more information. }}