Mainly changes to the manual.
Merge branch 'miguel' into devel

Conflicts:
	doc/constructing.tex
	doc/manual.dvi
	doc/manual.idx
	doc/manual.lab
	doc/manual.log
	doc/manual.six
	doc/manual.toc