DOCSP-48100: Consolidate minor versions

Author: norareidy

config/redirects

@@ -1,10 +1,14 @@
 define: base https://www.mongodb.com/docs/php-library
 define: prefix docs/php-library
 raw: ${prefix}/ -> ${base}/current
-define: versions v1.16 v1.17 v1.18 v1.19 v1.20 v1.21 v2.0 master
+define: versions v1.16 v1.17 v1.18 v1.19 v1.20 v1.21 v1.x v2.0 v2.x master
 
 symlink: upcoming -> master
-symlink: current -> v2.0
+symlink: current -> v2.x
+
+# consolidation redirects
+[*-v1.21]: ${prefix}/${version}/ -> ${base}/v1.x/
+[v2.0]: ${prefix}/${version}/ -> ${base}/v2.x/
 
 # general redirects
 [v1.17-v1.19]: ${prefix}/${version}/tutorial/client-side-encryption/ -> ${base}/${version}/tutorial/encryption/

source/upgrade.txt

@@ -90,7 +90,7 @@ associated JIRA tickets for each release on `GitHub
 
 .. _php-v2-breaking-changes:
 
-Version 2.0 Breaking Changes
+Version 2.x Breaking Changes
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
 This library version introduces the following breaking changes:
@@ -113,15 +113,15 @@ This library version introduces the following breaking changes:
   methods, you can register a :php:`CommandSubscriber
   <mongodb-driver-monitoring-commandsubscriber>` in your application.
 
-Version 1.20 Breaking Changes
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+Version 1.x Breaking Changes
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 
 This library version introduces the following breaking changes:
 
-- Drops support for {+mdb-server+} 3.6.
+- Drops support for {+mdb-server+} 3.6 in {+php-library+} v1.20
 
-Version 1.19 and Earlier
-~~~~~~~~~~~~~~~~~~~~~~~~
+.. tip:: Earlier Library Versions
 
-For library versions 1.19 and earlier, see the release notes and associated 
-JIRA tickets for each release on `GitHub <https://github.com/mongodb/mongo-php-library/releases>`__.  
+   To view breaking changes for {+php-library+} versions 1.19 and earlier, see the
+   release notes and associated JIRA tickets for each release on `GitHub
+   <https://github.com/mongodb/mongo-php-library/releases>`__.