Apply r9964 to trunk, and documentation update.

git-svn-id: https://crawl-ref.svn.sourceforge.net/svnroot/crawl-ref/trunk@9965 c06c8d41-db1a-0410-9941-cceddc491573

Created by  j-p-e-g  on June 11, 2009
AW3T6YSCFNRD3Y74B2YT4WH2EXDKCYEMSBGW5EITD2AUR2L7VU4AC
Change contents