Index: trunk/doc/contrib.html
===================================================================
--- trunk/doc/contrib.html	(revision 5608)
+++ trunk/doc/contrib.html	(revision 5609)
@@ -41,7 +41,7 @@
 Developer freedom taken away:
 <ul>
 	<li> the basic concept of pcb-rnd is set and won't change
-	<li> the toolchain is chosen, and won't change; the usual hot topics: svn, scconfig, <a href="hacking/c89.html">C</a>.
+	<li> the toolchain is chosen, and won't change; the usual hot topics: svn, scconfig, <a href="developer/c89.html">C</a>.
 	<li> don't add code that restricts usability for others; add code that increases usability for some; thus prefer to add code in plugins!
 </ul>
 <p>
@@ -53,7 +53,7 @@
 	<li> especially in plugins, work on whatever you want, even if noone else needs that feature
 </ul>
 <p>
-Coding style/indentation: there's an <a href="hacking/indent.html">unified style</a>
+Coding style/indentation: there's an <a href="developer/indent.html">unified style</a>
 in core and core plugins. If you work on those parts, try to stick to it. If you
 are working on a new plugin, it's still the preferred style but you can use
 a different style. However, the rule is that if someone else starts hacking
Index: trunk/doc/features/ba.html
===================================================================
--- trunk/doc/features/ba.html	(revision 5608)
+++ trunk/doc/features/ba.html	(revision 5609)
@@ -41,9 +41,9 @@
 actions and GUI.
 
 <h2> Design decisions </h2>
-This <a href="devlog/20150830b_back_ann.html"> devlog </a> entry functions
+This <a href="../devlog/20150830b_back_ann.html"> devlog </a> entry functions
 as a design decision document.
-<a href="devlog/20150901a_back_ann.html"> Another entry </a> is a summary
+<a href="../devlog/20150901a_back_ann.html"> Another entry </a> is a summary
 on how the feature ended up in a private feature-fork of gschem.
 
 <h2> save/load and compatibility </h2>
Index: trunk/doc/features/unglib.html
===================================================================
--- trunk/doc/features/unglib.html	(revision 5608)
+++ trunk/doc/features/unglib.html	(revision 5609)
@@ -22,7 +22,7 @@
 
 Removes glib dependency from core, in favor of
 <a href="http://repo.hu/projects/articles/minilibs">minilibs</a> to help
-keeping the code <a href="devlog/20160313_unglib.html">small, modular
+keeping the code <a href="../devlog/20160313_unglib.html">small, modular
 and easier to fix</a>.
 
 <h2> save/load and compatibility </h2>
Index: trunk/doc/motivation.html
===================================================================
--- trunk/doc/motivation.html	(revision 5608)
+++ trunk/doc/motivation.html	(revision 5609)
@@ -66,7 +66,7 @@
 		<ul>
 			<li> pin shapes (a <a href="features/square.html">preliminary version</a> is already implemented)
 			<li> 1206 jumpers without having to add them on the schematics/netlist (done: <a href="features/intconn.html">[intconn]</a> and <a href="features/nonetlist.html"> [nonetlist] </a> are the PCB-side features for this)
-			<li> merge pcb-gpmi; GPMI would be an optional addon, it'd probably stay a plugin, but there should not be a separate repo (<a href="gpmi"> done </a>)
+			<li> merge pcb-gpmi; GPMI would be an optional addon, it'd probably stay a plugin, but there should not be a separate repo (<a href="user/06_feature/gpmi/index.html"> done </a>)
 		</ul>
 </ul>
 <p>