Well, no-one has said anything after 48 hours, not even asking for
	more time, so I'm committing this as proposed.  It's a merge
	of the three template config files, {httpd,srm,access}.conf-dist
	into httpd.conf-dist, with some reordering and some aesthetic
	cleanup.  The same has been done for the *.conf-dist-win files.

Reviewed by:	Martin Kraemer, Ben Laurie, Jim Jagielski, Ralf Engelschall,
		Ben Hyde


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/1.3.x@82298 13f79535-47bb-0310-9956-ffa450edef68