From 5a0f04e232c3f2c681b99ba6f0a8e383303ec296 Mon Sep 17 00:00:00 2001 From: Andrey Andreev Date: Sat, 13 Jan 2018 14:01:06 +0200 Subject: [ci skip] Start 3.1.8-dev --- system/core/CodeIgniter.php | 2 +- user_guide_src/source/changelog.rst | 6 ++++++ user_guide_src/source/conf.py | 4 ++-- user_guide_src/source/installation/downloads.rst | 3 ++- user_guide_src/source/installation/upgrade_318.rst | 14 ++++++++++++++ user_guide_src/source/installation/upgrading.rst | 1 + 6 files changed, 26 insertions(+), 4 deletions(-) create mode 100644 user_guide_src/source/installation/upgrade_318.rst diff --git a/system/core/CodeIgniter.php b/system/core/CodeIgniter.php index 962196b6b..4f81a98b6 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.7'; + const CI_VERSION = '3.1.8-dev'; /* * ------------------------------------------------------ diff --git a/user_guide_src/source/changelog.rst b/user_guide_src/source/changelog.rst index e23517a86..686f9b83e 100644 --- a/user_guide_src/source/changelog.rst +++ b/user_guide_src/source/changelog.rst @@ -2,6 +2,12 @@ Change Log ########## +Version 3.1.8 +============= + +Release Date: Not Released + + Version 3.1.7 ============= diff --git a/user_guide_src/source/conf.py b/user_guide_src/source/conf.py index fbd81c47e..e03c3168f 100644 --- a/user_guide_src/source/conf.py +++ b/user_guide_src/source/conf.py @@ -48,9 +48,9 @@ copyright = u'2014 - 2018, British Columbia Institute of Technology' # built documents. # # The short X.Y version. -version = '3.1.7' +version = '3.1.8-dev' # The full version, including alpha/beta/rc tags. -release = '3.1.7' +release = '3.1.8-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 85f5ecf5f..03913159b 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.7 (Current version) `_ +- `CodeIgniter v3.1.8-dev (Current version) `_ +- `CodeIgniter v3.1.7 `_ - `CodeIgniter v3.1.6 `_ - `CodeIgniter v3.1.5 `_ - `CodeIgniter v3.1.4 `_ diff --git a/user_guide_src/source/installation/upgrade_318.rst b/user_guide_src/source/installation/upgrade_318.rst new file mode 100644 index 000000000..8b13f5c50 --- /dev/null +++ b/user_guide_src/source/installation/upgrade_318.rst @@ -0,0 +1,14 @@ +############################# +Upgrading from 3.1.7 to 3.1.8 +############################# + +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 1cc249869..a51b128ec 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.7 to 3.1.8 Upgrading from 3.1.6 to 3.1.7 Upgrading from 3.1.5 to 3.1.6 Upgrading from 3.1.4 to 3.1.5 -- cgit v1.2.3-24-g4f1b