From 1a1269149c1a56032740782aa957f76477d0311a Mon Sep 17 00:00:00 2001
From: Andrey Andreev <narf@devilix.net>
Date: Wed, 16 Jan 2019 17:53:59 +0200
Subject: [ci skip] Start of 3.1.11 development

---
 system/core/CodeIgniter.php                         |  2 +-
 user_guide_src/source/changelog.rst                 |  7 +++++++
 user_guide_src/source/conf.py                       |  4 ++--
 user_guide_src/source/installation/downloads.rst    |  3 ++-
 user_guide_src/source/installation/upgrade_3111.rst | 14 ++++++++++++++
 user_guide_src/source/installation/upgrading.rst    |  1 +
 6 files changed, 27 insertions(+), 4 deletions(-)
 create mode 100644 user_guide_src/source/installation/upgrade_3111.rst

diff --git a/system/core/CodeIgniter.php b/system/core/CodeIgniter.php
index 56826f1a6..a053777c1 100644
--- a/system/core/CodeIgniter.php
+++ b/system/core/CodeIgniter.php
@@ -55,7 +55,7 @@ defined('BASEPATH') OR exit('No direct script access allowed');
  * @var	string
  *
  */
-	const CI_VERSION = '3.1.10';
+	const CI_VERSION = '3.1.11-dev';
 
 /*
  * ------------------------------------------------------
diff --git a/user_guide_src/source/changelog.rst b/user_guide_src/source/changelog.rst
index 6ed61649a..ff9e92cf5 100644
--- a/user_guide_src/source/changelog.rst
+++ b/user_guide_src/source/changelog.rst
@@ -2,6 +2,13 @@
 Change Log
 ##########
 
+Version 3.1.11
+==============
+
+Release Date: Not Released
+
+
+
 Version 3.1.10
 ==============
 
diff --git a/user_guide_src/source/conf.py b/user_guide_src/source/conf.py
index 4f90eb48c..1bc93d1d4 100644
--- a/user_guide_src/source/conf.py
+++ b/user_guide_src/source/conf.py
@@ -48,9 +48,9 @@ copyright = u'2014 - 2019, British Columbia Institute of Technology'
 # built documents.
 #
 # The short X.Y version.
-version = '3.1.10'
+version = '3.1.11-dev'
 # The full version, including alpha/beta/rc tags.
-release = '3.1.10'
+release = '3.1.11-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 d7d891c80..7d34d71f6 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.10 (Current version) <https://codeload.github.com/bcit-ci/CodeIgniter/zip/3.1.10>`_
+-  `CodeIgniter v3.1.11 (Current version) <https://codeload.github.com/bcit-ci/CodeIgniter/zip/3.1-stable>`_
+-  `CodeIgniter v3.1.10 <https://codeload.github.com/bcit-ci/CodeIgniter/zip/3.1.10>`_
 -  `CodeIgniter v3.1.9 <https://codeload.github.com/bcit-ci/CodeIgniter/zip/3.1.9>`_
 -  `CodeIgniter v3.1.8 <https://codeload.github.com/bcit-ci/CodeIgniter/zip/3.1.8>`_
 -  `CodeIgniter v3.1.7 <https://codeload.github.com/bcit-ci/CodeIgniter/zip/3.1.7>`_
diff --git a/user_guide_src/source/installation/upgrade_3111.rst b/user_guide_src/source/installation/upgrade_3111.rst
new file mode 100644
index 000000000..5463e40c1
--- /dev/null
+++ b/user_guide_src/source/installation/upgrade_3111.rst
@@ -0,0 +1,14 @@
+###############################
+Upgrading from 3.1.10 to 3.1.11
+###############################
+
+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 c35cc05ff..0c2c0e8c9 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.10 to 3.1.11 <upgrade_3111>
 	Upgrading from 3.1.9 to 3.1.10 <upgrade_3110>
 	Upgrading from 3.1.8 to 3.1.9 <upgrade_319>
 	Upgrading from 3.1.7 to 3.1.8 <upgrade_318>
-- 
cgit v1.2.3-24-g4f1b