Fix some broken links already fixed in trunk. (incorrect module names in <directive>) Synch a bit with trunk