[lxc-devel] [linuxcontainers.org/master] note that both 1.0 and 2.0 are considered stable branches

[evgeni on Github]

A non-text attachment was scrubbed...
Name: not available
Type: text/x-mailbox
Size: 363 bytes
Desc: not available
URL: <http://lists.linuxcontainers.org/pipermail/lxc-devel/attachments/20160702/bfde2bea/attachment.bin>
-------------- next part --------------
From 26ecc3fdf6b07151cf5abb46dc759b84dd409181 Mon Sep 17 00:00:00 2001
From: Evgeni Golov <evgeni at debian.org>
Date: Sat, 2 Jul 2016 09:15:48 +0200
Subject: [PATCH] note that both 1.0 and 2.0 are considered stable branches

Signed-off-by: Evgeni Golov <evgeni at debian.org>
---
 content/lxc/downloads.md | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/content/lxc/downloads.md b/content/lxc/downloads.md
index 5bf1f43..a4b3f1b 100644
--- a/content/lxc/downloads.md
+++ b/content/lxc/downloads.md
@@ -4,10 +4,10 @@ LXC is included in most Linux distributions.
 In most cases installing it is as simple as selecting it in your package manager.
 
 Distributions also often provide backports of newer versions of LXC for their stable releases.  
-You may want to look for that, especially if your distribution doesn't include LXC 1.0.
+You may want to look for that, especially if your distribution doesn't include LXC 1.0 or 2.0.
 
-For production environment, try to stick to LXC 1.0.x as this is the long term,  
-stable release which we will support until April 2019.
+For production environment, try to stick to LXC 1.0.x or 2.0.x as these are the long term,  
+stable releases which we will support until April 2019 (1.0.x) or April 2021 (2.0.x).
 
 For Ubuntu users, we have official PPAs for LXC:
 
@@ -22,10 +22,11 @@ And for those who want development snapshots:
 
 # Current development version
 
-LXC has two active git branches:
+LXC has three active git branches:
 
  * **master**: Current development branch
  * **stable-1.0**: Stable update branch for LXC 1.0.x
+ * **stable-2.0**: Stable update branch for LXC 2.0.x
 
 You can clone those directly with: