diff --git a/documentation/current/eiffelstudio/_images/feature_call_auto-complete_example_1.png b/documentation/current/eiffelstudio/_images/feature_call_auto-complete_example_1.png
new file mode 100644
index 00000000..b79f57c0
Binary files /dev/null and b/documentation/current/eiffelstudio/_images/feature_call_auto-complete_example_1.png differ
diff --git a/documentation/current/eiffelstudio/_images/feature_call_auto-complete_example_1.png.data b/documentation/current/eiffelstudio/_images/feature_call_auto-complete_example_1.png.data
new file mode 100644
index 00000000..bce1e88d
--- /dev/null
+++ b/documentation/current/eiffelstudio/_images/feature_call_auto-complete_example_1.png.data
@@ -0,0 +1,3 @@
+title=feature call auto complete example 1
+author=halw
+path=content/feature-call-auto-complete-example-1
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 42bdacb4..368654b0 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
@@ -33,9 +33,13 @@ which would list all class names starting with "LI" and containing
{{note|Using the wild card character with auto-completion is valid only '''after''' auto-completion is triggered.}}
-When the list appears, the first list item will be selected. You can select a class name from the list by double-clicking a name in the list or by using the keyboard Up and Down buttons to navigate the list, then pressing Enter to select a highlighted class name. You can also continue to type characters and the list will automatically narrow, provided that you have non-matching entries filtered out (see [[#Auto-completion list display options|Auto-completion list display options]] below.) To validate your choice, press Enter. If there is no selected item when you validate, then the content of the text you have type will be used.
+When the list appears, the first list item will be selected. You can select a class name from the list by double-clicking a name in the list or by using the keyboard Up and Down buttons to navigate the list, then pressing Enter to select a highlighted class name. You can also continue to type characters and the list will automatically narrow, provided that you have non-matching entries filtered out (see [[#Auto-completion list display options|Auto-completion list display options]] below.)
-The auto-completion window can be cancelled by clicking outside the window or pressing Esc.
+To validate your choice, press Enter.
+
+If there is no selected item when you validate, then the content of the text you have type will be inserted.
+
+The auto-completion can be cancelled by clicking outside the window or pressing Esc.
[[Image:editor-class-auto-completion-window]]
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 0f007784..6fd4e8f0 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
@@ -41,26 +41,41 @@ Figure 1. The feature auto-completion window.
When the auto-completion window appears, the first item in the list, if any, will be selected. To complete your code with the selected item, press "Enter" or "Ctrl+Space". To choose another item, use keyboard Up and Down arrows or the mouse.
-You can also continue typing characters and the list will automatically be narrowed provided that you have non-matching entries filtered out (see [[#Auto-completion list display options|Auto-completion list display options]] below). To validate your choice, press "Enter" or "Ctrl+Space". If there is no selected item, the content of the text field will be inserted.
+You can also continue typing characters and the list will automatically be narrowed provided that you have non-matching entries filtered out (see '''Auto-completion list display options''' below). So, you can think of the auto-completion as a search for feature names using the characters you type followed by a wild card character, the asterisk ('*'). Of course, you don't have to put the asterisk at the end, it's just always implied. Once you've triggered auto-completion, you can however use the wild card character in the middle of a string, like this:
+
+
+ my_string.a*int
+
+which would narrow the list to all feature names starting with "a" and also containing the string "int".
+
+To validate your choice, press "Enter" or "Ctrl+Space".
+
+If there is no selected item, the content of the text you have typed will be inserted.
+
+The auto-completion can be cancelled by clicking outside the window or pressing Esc.
+
+==Entering routine arguments==
+
+After you have selected a feature, if the feature is a routine requiring arguments, the argument prototypes will be included in the generated feature text, and the text for the first argument will be selected, as in Figure 2.
-To cancel the auto-complete, press "Esc" at any time.
+[[Image:feature call auto complete example 1]]
+
+Figure 2. Auto-completion of a routine with arguments.
+
+
+Because the text for the first argument is already selected, you can go ahead and type a value for that argument. When you've completed the first argument, press Tab, and the next argument will be selected, and you can type a value for it. When you Tab after entering the final argument, the cursor will be positioned after the right parenthesis, so you are ready to move on.
==Auto-complete list display options==
At the bottom of the auto-completion window you will find a row of icons labeled "Options:". These options help you control which choices are presented to you and the format of their presentation. The options are described in the [[Class name auto complete#Auto-completion list display options|section on class name auto-completion]].
-{{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.
+{{tip|The following tips can help you get the most out of feature call automatic completion:
1) You can call the auto-complete without an identifier. The auto-complete window will then show the features of the current class.
2) The keyboard shortcut for automatic completion can be changed in the [[Keyboard shortcuts preferences|editor preferences]].
3) When the auto-completion window is open, typing any character (other than a wild card) that is not ordinarily valid in feature names automatically closes the window. So, you can type '.', ' ' or '(' to close the completion window and start typing the next token straight away.}}
+
+
+{{note|There are just a few more things you should know about feature call automatic completion:
1) 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.
2) Only compiled features will appear in the auto-complete window.
3) 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]]. }}
-{{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/formatted-information-about-compiled-classes-and-features/feature-views/feature-formatters-callers.wiki b/documentation/current/eiffelstudio/eiffelstudio-reference/formatted-information-about-compiled-classes-and-features/feature-views/feature-formatters-callers.wiki
index 0d2544b8..b90549e6 100644
--- a/documentation/current/eiffelstudio/eiffelstudio-reference/formatted-information-about-compiled-classes-and-features/feature-views/feature-formatters-callers.wiki
+++ b/documentation/current/eiffelstudio/eiffelstudio-reference/formatted-information-about-compiled-classes-and-features/feature-views/feature-formatters-callers.wiki
@@ -4,7 +4,7 @@
[[Property:uuid|63b7a88c-86ff-7aef-bf31-05d0ed850e4e]]
The callers view [[Image:feature-callers-icon]] display all the features which use the current feature in any way.
-So the callers view includes features which actually call the current feature. But it also includes those features that assign to the current feature (the feature's assigners [[Image:feature-assigners-icon]]), those features that create the current feature (the feature's creators [[Image:feature-creators-icon]]), and those features that use the current feature as an argument to other features.
+So the callers view includes features which actually call the current feature. Callers also includes those features that assign to the current feature (the feature's assigners [[Image:feature-assigners-icon]]), those features that create the current feature (the feature's creators [[Image:feature-creators-icon]]), and those features that use the current feature as an argument to other features.
In the EiffelStudio preferences it is possible to choose whether callers of the feature's descendant versions should be displayed too (they are by default).
diff --git a/documentation/current/platform-specifics/microsoft-windows/com/eiffelcom-wizard/com-and-eiffel/index.wiki b/documentation/current/platform-specifics/microsoft-windows/com/eiffelcom-wizard/com-and-eiffel/index.wiki
index eefe59c9..411858e6 100644
--- a/documentation/current/platform-specifics/microsoft-windows/com/eiffelcom-wizard/com-and-eiffel/index.wiki
+++ b/documentation/current/platform-specifics/microsoft-windows/com/eiffelcom-wizard/com-and-eiffel/index.wiki
@@ -4,8 +4,7 @@
[[Property:uuid|32e79152-1e8f-43cd-e014-a83aab18e440]]
==About COM and Eiffel==
-{{seealso|
-[[EiffelCOM Wizard|EiffelCOM wizard]]
+{{seealso| '''See Also'''
[[EiffelCOM Library| EiffelCOM library]] }}