Bring back trunk's generated documentation.
Merge from trunk.
Merge.