MaintNotes: post 2.11

index 3cb97cbc9e..a5ae137b6c 100644 --- a/MaintNotes +++ b/MaintNotes @@ -148,7 +148,7 @@ named with three dotted decimal digits (e.g. "1.8.5"), but recently we switched the versioning scheme and "feature releases" are named with three-dotted decimal digits that ends with ".0" (e.g. "1.9.0"). -The last such release was 2.10 done on Sep 2nd, 2016. You can expect +The last such release was 2.11 done on Nov 29th, 2016. You can expect that the tip of the "master" branch is always more stable than any of the released versions. @@ -161,8 +161,8 @@ of last-minute issues. The maintenance releases used to be named with four dotted decimal, named after the feature release they are updates to (e.g. "1.8.5.1" was the first maintenance release for "1.8.5" feature release). These days, maintenance releases are named by -incrementing the last digit of three-dotted decimal name (e.g. "2.9.3" -is the third maintenance release for the "2.9" series). +incrementing the last digit of three-dotted decimal name (e.g. "2.10.2" +is the second maintenance release for the "2.10" series). New features never go to the 'maint' branch. This branch is also merged into "master" to propagate the fixes forward as needed.