diff --git a/documentation/current/eiffelstudio/_images/disambiguated-name-icon.png b/documentation/current/eiffelstudio/_images/disambiguated-name-icon.png
new file mode 100644
index 00000000..f004e07b
Binary files /dev/null and b/documentation/current/eiffelstudio/_images/disambiguated-name-icon.png differ
diff --git a/documentation/current/eiffelstudio/_images/disambiguated-name-icon.png.data b/documentation/current/eiffelstudio/_images/disambiguated-name-icon.png.data
new file mode 100644
index 00000000..a2aebe33
--- /dev/null
+++ b/documentation/current/eiffelstudio/_images/disambiguated-name-icon.png.data
@@ -0,0 +1,3 @@
+title=disambiguated name icon
+author=halw
+path=content/disambiguated-name-icon
diff --git a/documentation/current/eiffelstudio/_images/feature-signatures-icon.png b/documentation/current/eiffelstudio/_images/feature-signatures-icon.png
new file mode 100644
index 00000000..ffaea53f
Binary files /dev/null and b/documentation/current/eiffelstudio/_images/feature-signatures-icon.png differ
diff --git a/documentation/current/eiffelstudio/_images/feature-signatures-icon.png.data b/documentation/current/eiffelstudio/_images/feature-signatures-icon.png.data
new file mode 100644
index 00000000..ea61119c
--- /dev/null
+++ b/documentation/current/eiffelstudio/_images/feature-signatures-icon.png.data
@@ -0,0 +1,3 @@
+title=feature signatures icon
+author=halw
+path=content/feature-signatures-icon
diff --git a/documentation/current/eiffelstudio/_images/hide-non-matching-entries-icon.png b/documentation/current/eiffelstudio/_images/hide-non-matching-entries-icon.png
new file mode 100644
index 00000000..953835a7
Binary files /dev/null and b/documentation/current/eiffelstudio/_images/hide-non-matching-entries-icon.png differ
diff --git a/documentation/current/eiffelstudio/_images/hide-non-matching-entries-icon.png.data b/documentation/current/eiffelstudio/_images/hide-non-matching-entries-icon.png.data
new file mode 100644
index 00000000..77296650
--- /dev/null
+++ b/documentation/current/eiffelstudio/_images/hide-non-matching-entries-icon.png.data
@@ -0,0 +1,3 @@
+title=hide non-matching entries icon
+author=halw
+path=content/hide-non-matching-entries-icon
diff --git a/documentation/current/eiffelstudio/_images/obsolete-items-icon.png b/documentation/current/eiffelstudio/_images/obsolete-items-icon.png
new file mode 100644
index 00000000..dc163fa5
Binary files /dev/null and b/documentation/current/eiffelstudio/_images/obsolete-items-icon.png differ
diff --git a/documentation/current/eiffelstudio/_images/obsolete-items-icon.png.data b/documentation/current/eiffelstudio/_images/obsolete-items-icon.png.data
new file mode 100644
index 00000000..c57df0db
--- /dev/null
+++ b/documentation/current/eiffelstudio/_images/obsolete-items-icon.png.data
@@ -0,0 +1,3 @@
+title=obsolete items icon
+author=halw
+path=content/obsolete-items-icon
diff --git a/documentation/current/eiffelstudio/_images/remember-list-size.png b/documentation/current/eiffelstudio/_images/remember-list-size.png
new file mode 100644
index 00000000..85fb095f
Binary files /dev/null and b/documentation/current/eiffelstudio/_images/remember-list-size.png differ
diff --git a/documentation/current/eiffelstudio/_images/remember-list-size.png.data b/documentation/current/eiffelstudio/_images/remember-list-size.png.data
new file mode 100644
index 00000000..af340b3d
--- /dev/null
+++ b/documentation/current/eiffelstudio/_images/remember-list-size.png.data
@@ -0,0 +1,3 @@
+title=remember list size icon
+author=halw
+path=content/remember-list-size-icon
diff --git a/documentation/current/eiffelstudio/_images/show-descriptions-icon.png b/documentation/current/eiffelstudio/_images/show-descriptions-icon.png
new file mode 100644
index 00000000..0704a548
Binary files /dev/null and b/documentation/current/eiffelstudio/_images/show-descriptions-icon.png differ
diff --git a/documentation/current/eiffelstudio/_images/show-descriptions-icon.png.data b/documentation/current/eiffelstudio/_images/show-descriptions-icon.png.data
new file mode 100644
index 00000000..292cb5a2
--- /dev/null
+++ b/documentation/current/eiffelstudio/_images/show-descriptions-icon.png.data
@@ -0,0 +1,3 @@
+title=show descriptions icon
+author=halw
+path=content/show-descriptions-icon
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 5a2eb88c..57aa48da 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
@@ -18,24 +18,34 @@ Class name auto-completion is also available in the parents "Entry:" text box on
==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 `LI'. So, you can imaging the auto-completion as a search for class names using the characters you type followed by a wild card character (*). The first item of the list 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. The auto-completion window can be cancelled by clicking outside the window or pressing Esc.
+The class auto-completion window will pop up and display the list of class names which begin with the string `LI'. So, you can imaging the auto-completion as a search for class 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 always there by implication. Once you've triggered the auto-completion, you can however use the wild card character in the middle of a string, like this:
+
+ a_variable_name: LI*R
+
+which would list all class names starting with `LI' and containing the character `R' appearing at some point after the `LI'.
+
+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. The auto-completion window can be cancelled by clicking outside the window or pressing Esc.
[[Image:editor-class-auto-completion-window]]
Figure 1. The class name auto-completion window
-
-===Options===
+===Auto-completion list display options===
At the bottom of the auto-completion window you will find a row of icons labeled "Options:". These icons help you control which choices are presented to you and the format of their presentation.
Each icon can be toggled between an "up" position and a "down" position by clicking on it. You can also toggle the option icons up and down by using the function keys F1 through F7.
-Not all of the options are applicable to class name auto-completion. Some apply only to feature name completion.
+Note that not all of the options are applicable to class name auto-completion. Some apply only to feature name completion.
-* [[Image:filter]] (F1) Filter: When down, you will see only those class names whose first characters match the string you have typed. When up, you see all classes in your system's universe.
-*
+* [[Image:hide non-matching entries icon]] (F1) Hide non-matching entries.
+* [[Image:query return type icon]] (F2) Show query return types.
+* [[Image:feature signatures icon]] (F3) Show feature signatures.
+* [[Image:disambiguated name icon]] (F4) Show disambiguated names.
+* [[Image:obsolete items icon]] (F5) Show obsolete items.
+* [[Image:show descriptions icon]] (F6) Show description of selected item.
+* [[Image:remember list size icon]] (F7) Remember the size of the completion list between triggerings.
diff --git a/documentation/current/method/void-safe-programming-eiffel/void-safety-background-definition-and-tools.wiki b/documentation/current/method/void-safe-programming-eiffel/void-safety-background-definition-and-tools.wiki
index 086034e9..da8418c4 100644
--- a/documentation/current/method/void-safe-programming-eiffel/void-safety-background-definition-and-tools.wiki
+++ b/documentation/current/method/void-safe-programming-eiffel/void-safety-background-definition-and-tools.wiki
@@ -202,7 +202,7 @@ where x is the formal argument for r, then if x is of
Stable attributes are really stable ''detachable'' attributes, as adding the concept of stability is meaningful only for detachable attributes. Declaring a detachable attribute as stable, means that it behaves like a detachable attribute except that its assignment rules mimic those of attached attributes. In other words, a stable attribute can never be the target of an assignment in which the source is Void or a detachable type.
- test: detachable TEST
+ my_test: detachable TEST
note
options: stable
attribute