From f4502e4ad6d8a595e472b85a5e0bc3f552b63306 Mon Sep 17 00:00:00 2001
From: Andrey Andreev <narf@devilix.net>
Date: Thu, 19 Sep 2019 15:12:46 +0300
Subject: [ci skip] Begin 3.1.12-dev

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

diff --git a/system/core/CodeIgniter.php b/system/core/CodeIgniter.php
index a053777c1..bd0c4c5d8 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.11-dev';
+	const CI_VERSION = '3.1.12-dev';
 
 /*
  * ------------------------------------------------------
diff --git a/user_guide_src/source/changelog.rst b/user_guide_src/source/changelog.rst
index 33f7cd852..401704efe 100644
--- a/user_guide_src/source/changelog.rst
+++ b/user_guide_src/source/changelog.rst
@@ -2,11 +2,17 @@
 Change Log
 ##########
 
-Version 3.1.11
+Version 3.1.12
 ==============
 
 Release Date: Not Released
 
+
+Version 3.1.11
+==============
+
+Release Date: Sep 19, 2019
+
 -  General Changes
 
    -  Changed ``CI_Log`` to append ``PHP_EOL`` instead of ``\n`` at the end of log messages.
diff --git a/user_guide_src/source/conf.py b/user_guide_src/source/conf.py
index 1bc93d1d4..25bdceeac 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.11-dev'
+version = '3.1.12-dev'
 # The full version, including alpha/beta/rc tags.
-release = '3.1.11-dev'
+release = '3.1.12-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 7d34d71f6..180734448 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.11 (Current version) <https://codeload.github.com/bcit-ci/CodeIgniter/zip/3.1-stable>`_
+-  `CodeIgniter v3.1.12-dev (Current version) <https://codeload.github.com/bcit-ci/CodeIgniter/zip/3.1-stable>`_
+-  `CodeIgniter v3.1.11 <https://codeload.github.com/bcit-ci/CodeIgniter/zip/3.1.11>`_
 -  `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>`_
diff --git a/user_guide_src/source/installation/upgrade_3112.rst b/user_guide_src/source/installation/upgrade_3112.rst
new file mode 100644
index 000000000..9c849d878
--- /dev/null
+++ b/user_guide_src/source/installation/upgrade_3112.rst
@@ -0,0 +1,14 @@
+###############################
+Upgrading from 3.1.11 to 3.1.12
+###############################
+
+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 0c2c0e8c9..2499fe24b 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.11 to 3.1.12 <upgrade_3112>
 	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>
-- 
cgit v1.2.3-24-g4f1b