From 80906c2a0c2f3252ce8defb7b62e8c8dc97863e5 Mon Sep 17 00:00:00 2001
From: Matthias Schiffer <mschiffer@universe-factory.net>
Date: Sat, 16 May 2015 15:34:55 +0200
Subject: [PATCH] docs, README: change current release to v2015.1

---
 README.md                     | 2 +-
 docs/conf.py                  | 4 ++--
 docs/releases/v2015.1.rst     | 4 ++--
 docs/site-example/site.conf   | 2 +-
 docs/user/getting_started.rst | 2 +-
 5 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/README.md b/README.md
index acb027fb3..877501368 100644
--- a/README.md
+++ b/README.md
@@ -16,7 +16,7 @@ our mailinglist to discuss it first.
 
 Please refrain from using the master branch for anything else but development purposes!
 Use the most recent release instead. You can list all relaseses by running `git branch -a`
-and switch to one by running `git checkout v2014.4;make update`.
+and switch to one by running `git checkout v2015.1 && make update`.
 
 If you're using the autoupdater, do not autoupdate nodes with anything but releases.
 If you upgrade using random master commits the nodes *will break* eventually.
diff --git a/docs/conf.py b/docs/conf.py
index 0856ed6f0..4dee07af7 100644
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -54,9 +54,9 @@ copyright = '2015, Project Gluon'
 # built documents.
 #
 # The short X.Y version.
-version = '2014.4+'
+version = '2015.1'
 # The full version, including alpha/beta/rc tags.
-release = '2014.4+'
+release = '2015.1'
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.
diff --git a/docs/releases/v2015.1.rst b/docs/releases/v2015.1.rst
index aac47e6fd..8e5c8e99d 100644
--- a/docs/releases/v2015.1.rst
+++ b/docs/releases/v2015.1.rst
@@ -1,5 +1,5 @@
-Gluon 2015.1 (in development)
-=============================
+Gluon 2015.1
+============
 
 Added hardware support
 ~~~~~~~~~~~~~~~~~~~~~~
diff --git a/docs/site-example/site.conf b/docs/site-example/site.conf
index 310f8bc56..0849c07e7 100644
--- a/docs/site-example/site.conf
+++ b/docs/site-example/site.conf
@@ -1,4 +1,4 @@
--- This is an example site configuration for Gluon v2014.4
+-- This is an example site configuration for Gluon v2015.1
 --
 -- Take a look at the documentation located at
 -- http://gluon.readthedocs.org/ for details.
diff --git a/docs/user/getting_started.rst b/docs/user/getting_started.rst
index adbec0264..885a38879 100644
--- a/docs/user/getting_started.rst
+++ b/docs/user/getting_started.rst
@@ -38,7 +38,7 @@ Building the images
 -------------------
 
 To build Gluon, first check out the repository. Replace *RELEASE* with the
-version you'd like to checkout, e.g. *v2014.4*.
+version you'd like to checkout, e.g. *v2015.1*.
 
 ::
 
-- 
GitLab