From 0b9540209499fbd0515e13fdc66e85dea4b6baad Mon Sep 17 00:00:00 2001
From: Andrey Andreev <narf@devilix.net>
Date: Tue, 26 Jul 2016 20:52:30 +0300
Subject: [ci skip] Mark the start of 3.1.1 development

---
 user_guide_src/source/changelog.rst                | 13 +++++++++++++
 user_guide_src/source/conf.py                      |  4 ++--
 user_guide_src/source/installation/downloads.rst   |  3 ++-
 user_guide_src/source/installation/upgrade_311.rst | 14 ++++++++++++++
 user_guide_src/source/installation/upgrading.rst   |  1 +
 5 files changed, 32 insertions(+), 3 deletions(-)
 create mode 100644 user_guide_src/source/installation/upgrade_311.rst

(limited to 'user_guide_src/source')

diff --git a/user_guide_src/source/changelog.rst b/user_guide_src/source/changelog.rst
index 058eb275f..c09c1b592 100644
--- a/user_guide_src/source/changelog.rst
+++ b/user_guide_src/source/changelog.rst
@@ -2,6 +2,19 @@
 Change Log
 ##########
 
+Version 3.1.1
+=============
+
+Release Date: Not Released
+
+
+
+Bug fixes for 3.1.1
+-------------------
+
+
+
+
 Version 3.1.0
 =============
 
diff --git a/user_guide_src/source/conf.py b/user_guide_src/source/conf.py
index 9e78d242d..0c4901d8f 100644
--- a/user_guide_src/source/conf.py
+++ b/user_guide_src/source/conf.py
@@ -48,9 +48,9 @@ copyright = u'2014 - 2016, British Columbia Institute of Technology'
 # built documents.
 #
 # The short X.Y version.
-version = '3.1.0'
+version = '3.1.1-dev'
 # The full version, including alpha/beta/rc tags.
-release = '3.1.0'
+release = '3.1.1-dev'
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.
diff --git a/user_guide_src/source/installation/downloads.rst b/user_guide_src/source/installation/downloads.rst
index 80d2412cd..7380dcb28 100644
--- a/user_guide_src/source/installation/downloads.rst
+++ b/user_guide_src/source/installation/downloads.rst
@@ -2,7 +2,8 @@
 Downloading CodeIgniter
 #######################
 
--  `CodeIgniter v3.1.0 (Current version) <https://codeload.github.com/bcit-ci/CodeIgniter/zip/3.1.0>`_
+-  `CodeIgniter v3.1.1 (Current version) <https://codeload.github.com/bcit-ci/CodeIgniter/zip/3.1-stable>`_
+-  `CodeIgniter v3.1.0 <https://codeload.github.com/bcit-ci/CodeIgniter/zip/3.1.0>`_
 -  `CodeIgniter v3.0.6 <https://codeload.github.com/bcit-ci/CodeIgniter/zip/3.0.6>`_
 -  `CodeIgniter v3.0.5 <https://codeload.github.com/bcit-ci/CodeIgniter/zip/3.0.5>`_
 -  `CodeIgniter v3.0.4 <https://codeload.github.com/bcit-ci/CodeIgniter/zip/3.0.4>`_
diff --git a/user_guide_src/source/installation/upgrade_311.rst b/user_guide_src/source/installation/upgrade_311.rst
new file mode 100644
index 000000000..a36e72323
--- /dev/null
+++ b/user_guide_src/source/installation/upgrade_311.rst
@@ -0,0 +1,14 @@
+#############################
+Upgrading from 3.1.0 to 3.1.1
+#############################
+
+Before performing an update you should take your site offline by
+replacing the index.php file with a static one.
+
+Step 1: Update your CodeIgniter files
+=====================================
+
+Replace all files and directories in your *system/* directory.
+
+.. note:: If you have any custom developed files in these directories,
+	please make copies of them first.
diff --git a/user_guide_src/source/installation/upgrading.rst b/user_guide_src/source/installation/upgrading.rst
index f0cf8c903..727d054d1 100644
--- a/user_guide_src/source/installation/upgrading.rst
+++ b/user_guide_src/source/installation/upgrading.rst
@@ -8,6 +8,7 @@ upgrading from.
 .. toctree::
 	:titlesonly:
 
+	Upgrading from 3.1.0 to 3.1.1 <upgrade_311>
 	Upgrading from 3.0.6 to 3.1.0 <upgrade_310>
 	Upgrading from 3.0.5 to 3.0.6 <upgrade_306>
 	Upgrading from 3.0.4 to 3.0.5 <upgrade_305>
-- 
cgit v1.2.3-24-g4f1b