Index: 07_devmap.html
===================================================================
--- 07_devmap.html	(revision 309)
+++ 07_devmap.html	(revision 310)
@@ -24,10 +24,10 @@
 <p>{des7:2}
 The default implementation of the device mapper is a plugin called <i>devmap</i>.
 <code>Devmap</code> has three major features: slotting name translation
-(red), device mapping (green) and pin mapping (blue). The slotting translation
+(red), device mapping (green) and port mapping (blue). The slotting translation
 makes sure the resulting abstract component has the right amount of ports;
-the device mapper loads the device-specific pin mapping and other
-attributes from a database; the pin mapper applies pin numbers from
+the device mapper loads the device-specific port mapping and other
+attributes from a database; the port mapper applies pin numbers from
 a table (the table typically set up by the device mapper).
 
 <p>{des7:3}
@@ -39,9 +39,9 @@
 	     by not having a <i>slot</i> attribute
 	<li> not using the device mapping mechanism described here, on per symbol basis,
 	     by not having a <i>devmap</i> attribute
-	<li> not using the pin mapping mechanism described here, on per symbol basis,
-	     by not having a <i>pinmap</i> attribute and not using a device map
-	     that would introduce a <i>pinmap</i> attribute
+	<li> not using the port mapping mechanism described here, on per symbol basis,
+	     by not having a <i>portmap</i> attribute and not using a device map
+	     that would introduce a <i>portmap</i> attribute
 </ul>
 
 <p>{des7:4}
@@ -93,10 +93,10 @@
 as the terminal names of the symbol.
 
 
-<h2> 7.2. Pin mapping </h2>
+<h2> 7.2. Port mapping </h2>
 
 <p>{des7:12}
-Pin mapping takes a map between the symbolic description  and emits the
+Port 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 <a href="04_attrib.html#des4:9"> attribute
@@ -129,9 +129,9 @@
 an error, a DRC plugin shall check for it.
 
 <p><table border=1 cellspacing=0>
-<tr><th colspan=3 bgcolor="#aaaaaa"> {des7:18} pin mapping related symbol attributes
+<tr><th colspan=3 bgcolor="#aaaaaa"> {des7:18} port mapping related symbol attributes
 <tr><th> attribute              <th> value                <th> description
-<tr><td> <code>pinmap</code>    <td> array of map entries <td> the actual map, as <a href="#des7:13"> described above </a>
+<tr><td> <code>portmap</code>   <td> array of map entries <td> the actual map, as <a href="#des7:13"> described above </a>
 <tr><td> <code>slot</code>      <td> slot name            <td> textual name of the slot the symbol provides
 </table>
 
@@ -148,7 +148,7 @@
 had the "<code>devmap</code>" attribute.
 
 <p>{des7:21}
-A common device map file will usually have a "<code>pinmap</code>" attribute that will
+A common device map file will usually have a "<code>portmap</code>" attribute that will
 set at least one attributes on each terminal.
 
 <p><table border=1 cellspacing=0>