Index: trunk/doc/conf/index_user.html
===================================================================
--- trunk/doc/conf/index_user.html	(revision 30987)
+++ trunk/doc/conf/index_user.html	(revision 30988)
@@ -24,7 +24,7 @@
 <p>
 Config settings are imported from multiple sources: from different files,
 from environment variables, from command line arguments, from the opened (.pcb
-or .lht) files on load. Any source can define any part of the <i>config tree</i>.
+or .lht) board files on load. Any source can define any part of the <i>config tree</i>.
 When the configuration is processed, each source is read into a temporary
 tree and then all the temporary trees are merged into the final
 <i>config tree</i>. The following diagram demonstrates all configuration
Index: trunk/doc/conf/merging.png
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Index: trunk/doc/conf/src/merging.dot
===================================================================
--- trunk/doc/conf/src/merging.dot	(revision 30987)
+++ trunk/doc/conf/src/merging.dot	(revision 30988)
@@ -61,7 +61,7 @@
 		label="config files"
 		bgcolor=grey
 		lht_system        [label="/usr/share/pcb-rnd/pcb-conf.lht" shape=hexagon]
-		pcb_default       [label="/usr/share/pcb-rnd/default.pcb" shape=hexagon]
+		pcb_default       [label="default board, e.g.\n/usr/share/pcb-rnd/default4.lht" shape=hexagon]
 		project           [label="./project.lht" shape=hexagon]
 		lht_user          [label="~/.pcb-rnd/pcb-conf.lht" shape=hexagon]
 	}
@@ -74,7 +74,7 @@
 	}
 
 	lht_internal      [label="hardwired\nin the\nexecutable"]
-	design            [label="settings\nin the\n.pcb file" shape=hexagon]
+	design            [label="settings\nin the\nboard file\n(.lht and .pcb)" shape=hexagon]
 
 	lht_internal -> CFR_INTERNAL    [label="program startup"]
 	lht_system   -> CFR_SYSTEM      [label="loaded at startup"]
@@ -81,7 +81,7 @@
 	pcb_default  -> CFR_DEFAULTPCB  [label="loadad in CreateNewPCB()"]
 	lht_user     -> CFR_USER        [label="loaded at startup" dir=both]
 	env          -> CFR_ENV         [label="built at startup"]
-	project      -> CFR_PROJECT     [label="loaded when a\nnew .pcb or project\nis loaded" dir=both]
+	project      -> CFR_PROJECT     [label="loaded when a\nnew board or project\nis loaded" dir=both]
 	design       -> CFR_DESIGN      [label="extracted when loading a design" dir=both]
 	cli          -> CFR_CLI         [label="built during\ncommand line argument\nparsing"]