Index: trunk/doc/design/07_devmap.html
===================================================================
--- trunk/doc/design/07_devmap.html	(revision 268)
+++ trunk/doc/design/07_devmap.html	(revision 269)
@@ -27,21 +27,34 @@
 include the device mapper in the view at all. 
 
 <p>{des7:0}
-The device mapper has two major features: the low level
-pin mapping and the high level device mapping. Device mapping emits
-attributes read by pin mapping.
+The device mapper has three major features: slotting name translation,
+pin mapping and device mapping.
 
+<h2> 7.1. Slotting </h2>
 
-<h2> 7.1. Pin mapping </h2>
+<p>{des7:0}
+Devmap registers for the <a href="02_data#des2:77">terminal-name-to-port-name
+translation</a> and in case of slotted maps.
 
 <p>{des7:0}
-The low level feature, pin mapping, takes a map between the symbolic
-description  and emits the physical description
-(port numbers for a footprint or sim model). There shall be one such mapping
-per abstract component. If multiple symbols contribute a mapping, the
-(TODO: link:) attribute priority mechanism will keep only one of the arrays.
+If the <i>slot</i> attribute presents in a symbol, the translation is
+activated. The slot name is taken directly from the concrete symbol's
+<i>slot</i> attribute. All ports are then named  as
+<i>slot/terminal-name</i> and the slot attribute is then removed from the
+abstract component to avoid collisions.
 
+
+<h2> 7.2. Pin mapping </h2>
+
 <p>{des7:0}
+Pin mapping takes a map between the symbolic description  and emits the
+physical description (port numbers for a footprint or sim model). There
+shall be one such mapping per abstract component. If multiple symbols
+contribute a mapping, the (TODO: link:) attribute priority mechanism will
+keep only one of the arrays.
+
+
+<p>{des7:0}
 The input is a array is an unordered list of (terminal name + slot name)
 -&gt; (attribute_name + value) pairs, each specified in the following syntax:
 <pre>
@@ -54,17 +67,6 @@
 
 
 <p>{des7:0}
-The map is then searched for the slot/terminal pair; if it is found, the
-terminal name is <a href="02_data#des2:77"> translated </a> (so that the
-right amount of ports are created in the abstract component for the
-slots) and attribute_name=value is set on the resulting port.
-
-<p>{des7:0}
-For this the pin mapper registers for the terminal-name-to-port-name
-translation and in case of slotted maps. The slot name is taken directly
-from the concrete symbol's <i>term</i> attribute.
-
-<p>{des7:0}
 If a slot/terminal pair is not found in the map, an error message is
 emitted. This happens when the schematics symbol uses a terminal that
 has no physical pin with the given device.
@@ -84,7 +86,7 @@
 <tr><td> slot      <td> slot name            <td> textual name of the slot the symbol provides
 </table>
 
-<h2> 7.2. Device mapping </h2>
+<h2> 7.3. Device mapping </h2>
 
 <p>{des7:0}
 The device mapper takes the <i>devmap</i> attribute of a symbol and looks it up