add doc/
replace symlink Makefile.include by the real file
Merge branch 'master' into doc
set sw=2 in vim modeline
more work on discofs.tex
Merge branch 'doc'