metomi/rose#428: fix bad pages
Merge pull request #440 from benfitzpatrick/428.doc-expand-links

#428: fix bad pages. Fixes #428
Merge remote branch 'upstream/master' into doc_conflict

Conflicts:
	doc/rose-rug-advanced-tutorials-macro.html
Merge pull request #1 from arjclark/doc_conflict

Doc conflict