Merge r344971 from trunk:

Make references to 2.1 and later consistent with each other.

Reviewed by: colm


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