integration of general/web in main

[Graham Percival]

Jan, I'm glad that you're very enthusiastic about the new website,
but did you check with John about this integration?  He was
working on the Documentation build system, so this might have
duplicated some of his efforts.

Also, we'll need a @rgeneral macro sooner or later... preferably
sooner, since there's now tons of broken refs in the docs... but
it should wait until we've sorted out the more basic doc build
system questions.

Cheers,
- Graham