Index: trunk/doc/examples/funcmap/fmexample.rs
===================================================================
--- trunk/doc/examples/funcmap/fmexample.rs	(revision 9951)
+++ trunk/doc/examples/funcmap/fmexample.rs	(revision 9952)
@@ -23,17 +23,17 @@
 								{ PB2/PCINT10  -> sigtype=digital; dir=input  }
 								{ PB2/OC0A     -> sigtype=digital; dir=output }
 								{ PB2/INT0     -> sigtype=digital; dir=input  }
-								{ PB7/PB7      -> sigtype=digital; }
-								{ PB7/PCINT7   -> sigtype=digital; dir=input  }
-								{ PB7/OC0B     -> sigtype=digital; dir=output }
-								{ PB7/ADC7     -> sigtype=digital; dir=input  }
-								{ PB6/PB6      -> sigtype=digital; }
-								{ PB6/PCINT6   -> sigtype=digital; dir=input  }
-								{ PB6/MOSI     -> sigtype=digital; }
-								{ PB6/DI       -> sigtype=digital; dir=input  }
-								{ PB6/SDA      -> sigtype=digital; }
-								{ PB6/OC1A     -> sigtype=digital; dir=output }
-								{ PB6/ADC6     -> sigtype=analog;  dir=input  }
+								{ PA7/PA7      -> sigtype=digital; }
+								{ PA7/PCINT7   -> sigtype=digital; dir=input  }
+								{ PA7/OC0B     -> sigtype=digital; dir=output }
+								{ PA7/ADC7     -> sigtype=digital; dir=input  }
+								{ PA6/PA6      -> sigtype=digital; }
+								{ PA6/PCINT6   -> sigtype=digital; dir=input  }
+								{ PA6/MOSI     -> sigtype=digital; }
+								{ PA6/DI       -> sigtype=digital; dir=input  }
+								{ PA6/SDA      -> sigtype=digital; }
+								{ PA6/OC1A     -> sigtype=digital; dir=output }
+								{ PA6/ADC6     -> sigtype=analog;  dir=input  }
 								{ PA0/PA0      -> sigtype=digital; }
 								{ PA0/PCINT0   -> sigtype=digital; dir=input  }
 								{ PA0/AREF+ADC0-> sigtype=analog;  dir=input  }
@@ -66,7 +66,7 @@
 								{ USI          -> SCK, DI, DO }
 							}
 							li:funcmap/weak_groups {
-								{ gpio         -> PB0, PB1, PB2, PB3, PB6, PB7, PA0, PA1, PA2, PA3, PA4, PA5 }
+								{ gpio         -> PB0, PB1, PB2, PB3, PA6, PA7, PA0, PA1, PA2, PA3, PA4, PA5 }
 								{ pcint        -> PCINT8, PCINT9, PCINT11, PCINT10, PCINT7, PCINT6, PCINT0, PCINT1, PCINT2, PCINT3, PCINT4, PCINT5 }
 								{ xtal         -> XTAL1, XTAL2 }
 								{ PWM          -> OC0A, OC0B, OC1A, OC1B }
@@ -229,7 +229,7 @@
 							ha:text.3 { x1=-500; y1=-2000; mirx=1; dyntext=1; stroke=term-secondary; text=%../a.funcmap/name%; }
 						}
 						ha:attrib {
-							name=PB7
+							name=PA7
 							pinnum=6
 							role=terminal
 						}
@@ -243,7 +243,7 @@
 							ha:text.3 { x1=-500; y1=-2000; mirx=1; dyntext=1; stroke=term-secondary; text=%../a.funcmap/name%; }
 						}
 						ha:attrib {
-							name=PB6
+							name=PA6
 							pinnum=7
 							role=terminal
 						}
Index: trunk/doc/examples/funcmap/funcmap/attiny24.funcmap
===================================================================
--- trunk/doc/examples/funcmap/funcmap/attiny24.funcmap	(revision 9951)
+++ trunk/doc/examples/funcmap/funcmap/attiny24.funcmap	(revision 9952)
@@ -18,18 +18,18 @@
 			{ PB2/OC0A     -> sigtype=digital; dir=output }
 			{ PB2/INT0     -> sigtype=digital; dir=input  }
 
-			{ PB7/PB7      -> sigtype=digital; }
-			{ PB7/PCINT7   -> sigtype=digital; dir=input  }
-			{ PB7/OC0B     -> sigtype=digital; dir=output }
-			{ PB7/ADC7     -> sigtype=digital; dir=input  }
+			{ PA7/PA7      -> sigtype=digital; }
+			{ PA7/PCINT7   -> sigtype=digital; dir=input  }
+			{ PA7/OC0B     -> sigtype=digital; dir=output }
+			{ PA7/ADC7     -> sigtype=digital; dir=input  }
 
-			{ PB6/PB6      -> sigtype=digital; }
-			{ PB6/PCINT6   -> sigtype=digital; dir=input  }
-			{ PB6/MOSI     -> sigtype=digital; }
-			{ PB6/DI       -> sigtype=digital; dir=input  }
-			{ PB6/SDA      -> sigtype=digital; }
-			{ PB6/OC1A     -> sigtype=digital; dir=output }
-			{ PB6/ADC6     -> sigtype=analog;  dir=input  }
+			{ PA6/PA6      -> sigtype=digital; }
+			{ PA6/PCINT6   -> sigtype=digital; dir=input  }
+			{ PA6/MOSI     -> sigtype=digital; }
+			{ PA6/DI       -> sigtype=digital; dir=input  }
+			{ PA6/SDA      -> sigtype=digital; }
+			{ PA6/OC1A     -> sigtype=digital; dir=output }
+			{ PA6/ADC6     -> sigtype=analog;  dir=input  }
 
 			{ PA0/PA0      -> sigtype=digital; }
 			{ PA0/PCINT0   -> sigtype=digital; dir=input  }
@@ -65,7 +65,7 @@
 
 		# sorting for display
 		li:funcmap/weak_groups {
-			{ gpio         -> PB0, PB1, PB2, PB3, PB6, PB7, PA0, PA1, PA2, PA3, PA4, PA5 }
+			{ gpio         -> PB0, PB1, PB2, PB3, PA6, PA7, PA0, PA1, PA2, PA3, PA4, PA5 }
 			{ pcint        -> PCINT8, PCINT9, PCINT11, PCINT10, PCINT7, PCINT6, PCINT0, PCINT1, PCINT2, PCINT3, PCINT4, PCINT5 }
 			{ xtal         -> XTAL1, XTAL2 }
 			{ PWM          -> OC0A, OC0B, OC1A, OC1B }
Index: trunk/doc/examples/funcmap/symbol/attiny24.bs
===================================================================
--- trunk/doc/examples/funcmap/symbol/attiny24.bs	(revision 9951)
+++ trunk/doc/examples/funcmap/symbol/attiny24.bs	(revision 9952)
@@ -37,13 +37,13 @@
 	funcmap
 end pin
 
-begin pin PB7
+begin pin PA7
 	num 6
 	loc left
 	funcmap
 end pin
 
-begin pin PB6
+begin pin PA6
 	num 7
 	loc left
 	funcmap
Index: trunk/doc/examples/funcmap/symbol/attiny24.ry
===================================================================
--- trunk/doc/examples/funcmap/symbol/attiny24.ry	(revision 9951)
+++ trunk/doc/examples/funcmap/symbol/attiny24.ry	(revision 9952)
@@ -99,7 +99,7 @@
 				ha:attrib {
 					role=terminal;
 					pinnum=6;
-					name=PB7;
+					name=PA7;
 				}
 			}
 			ha:group.9 {
@@ -114,7 +114,7 @@
 				ha:attrib {
 					role=terminal;
 					pinnum=7;
-					name=PB6;
+					name=PA6;
 				}
 			}
 			ha:group.10 {