Go back to trunk's config doc (will make it easier to see differences between trunk and this branch).