aboutsummaryrefslogtreecommitdiffstats
path: root/guides
diff options
context:
space:
mode:
authorMatias Korhonen <matias@kiskolabs.com>2014-04-08 23:10:29 +0300
committerMatias Korhonen <matias@kiskolabs.com>2014-04-08 23:18:49 +0300
commitf0125a19b9ae73e818c89739a823a319280e8ef5 (patch)
treee559309794af9dbe79db8d6e96ea4d601c975923 /guides
parent304d2f19c830bac17ce2a15d550bb7eb06ea2f11 (diff)
downloadrails-f0125a19b9ae73e818c89739a823a319280e8ef5.tar.gz
rails-f0125a19b9ae73e818c89739a823a319280e8ef5.tar.bz2
rails-f0125a19b9ae73e818c89739a823a319280e8ef5.zip
Updates the maintenance policy with new Rails versions
Diffstat (limited to 'guides')
-rw-r--r--guides/CHANGELOG.md4
-rw-r--r--guides/source/maintenance_policy.md6
2 files changed, 7 insertions, 3 deletions
diff --git a/guides/CHANGELOG.md b/guides/CHANGELOG.md
index 246e1d3b96..6037adf17f 100644
--- a/guides/CHANGELOG.md
+++ b/guides/CHANGELOG.md
@@ -2,4 +2,8 @@
*Alex Riabov*
+* Updates the maintenance policy to match the latest versions of Rails
+
+ *Matias Korhonen*
+
Please check [4-1-stable](https://github.com/rails/rails/blob/4-1-stable/guides/CHANGELOG.md) for previous changes.
diff --git a/guides/source/maintenance_policy.md b/guides/source/maintenance_policy.md
index 93729c6f72..8f119f36aa 100644
--- a/guides/source/maintenance_policy.md
+++ b/guides/source/maintenance_policy.md
@@ -20,7 +20,7 @@ Only the latest release series will receive bug fixes. When enough bugs are
fixed and its deemed worthy to release a new gem, this is the branch it happens
from.
-**Currently included series:** 4.0.z
+**Currently included series:** 4.1.z, 4.0.z
Security Issues
---------------
@@ -35,7 +35,7 @@ be built from 1.2.2, and then added to the end of 1-2-stable. This means that
security releases are easy to upgrade to if you're running the latest version
of Rails.
-**Currently included series:** 4.0.z, 3.2.z
+**Currently included series:** 4.1.z, 4.0.z
Severe Security Issues
----------------------
@@ -44,7 +44,7 @@ For severe security issues we will provide new versions as above, and also the
last major release series will receive patches and new versions. The
classification of the security issue is judged by the core team.
-**Currently included series:** 4.0.z, 3.2.z
+**Currently included series:** 4.1.z, 4.0.z, 3.2.z
Unsupported Release Series
--------------------------