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 b0e2c1fc..b30c9169 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,15 +1,22 @@
 [[Property:title|Class name auto complete]]
 [[Property:weight|3]]
 [[Property:uuid|0f11a078-7dab-54d1-b624-4c04476564a5]]
-The EiffelStudio editor will complete class names automatically. This means that when the user types:
+==Overview==
+The EiffelStudio editor will complete class names automatically. This means, for example, 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. 
+    a_variable_name: LI</code>
+and then triggers the auto-complete, one of two things will happen:
+* If there is only one class name in the universe that begins `<code>LI</code>', then that class name will be automatically placed in the editor window at the cursor.
+* If there is more than one such class name, the editor will propose a list of possible valid class names, as seen in Figure 1. <br/>
+
+==The class auto-completion window==
+The class auto-completion window will pop up and display the list of class names which begin with the string `<code>LI</code>'. The user can select a class name from the list by double-clicking a name in the list or by highlighting a name and pressing <code>Return</code>. The auto-complete window can be cancelled by clicking outside the window. 
 
 
 [[Image:editor-class-auto-completion-window]]  
 
+Figure 1. The 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/>