From 763b7703ee744b65878bbf721fce3e5ec4dfac82 Mon Sep 17 00:00:00 2001 From: Andrey Andreev Date: Mon, 26 Jun 2017 10:26:33 +0300 Subject: [ci skip] Merge pull request #5162 from hex-ci/patch-3 Fix a spelling typo in security docs --- user_guide_src/source/libraries/security.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'user_guide_src') diff --git a/user_guide_src/source/libraries/security.rst b/user_guide_src/source/libraries/security.rst index fc5cba19d..868112684 100644 --- a/user_guide_src/source/libraries/security.rst +++ b/user_guide_src/source/libraries/security.rst @@ -107,7 +107,7 @@ Class Reference If the optional second parameter is set to true, it will return boolean TRUE if the image is safe to use and FALSE if malicious data was detected in it. - .. important:: This method is not suitable for filtering HTML attribute vales! + .. important:: This method is not suitable for filtering HTML attribute values! Use :php:func:`html_escape()` for that instead. .. php:method:: sanitize_filename($str[, $relative_path = FALSE]) -- cgit v1.2.3-24-g4f1b From 894a3f2c9fe111af35dee4f5e8e711259b893fb6 Mon Sep 17 00:00:00 2001 From: Andrey Andreev Date: Tue, 27 Jun 2017 16:31:17 +0300 Subject: Fix #5164 --- user_guide_src/source/changelog.rst | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'user_guide_src') diff --git a/user_guide_src/source/changelog.rst b/user_guide_src/source/changelog.rst index 3012b9eb2..fd7485f64 100644 --- a/user_guide_src/source/changelog.rst +++ b/user_guide_src/source/changelog.rst @@ -8,6 +8,11 @@ Version 3.1.6 Release Date: Not Released +Bug fixes for 3.1.6 +------------------- + +- Fixed a bug (#5164) - :doc:`Loader Library ` method ``library()`` ignored requests to load libraries previously assigned to super-object properties named differently than the library name. + Version 3.1.5 ============= -- cgit v1.2.3-24-g4f1b From 59bae57503865f6dcea91fc20fd2729b2e79bb74 Mon Sep 17 00:00:00 2001 From: Andrey Andreev Date: Mon, 3 Jul 2017 14:13:08 +0300 Subject: [ci skip] Fix #5168 --- user_guide_src/source/changelog.rst | 1 + 1 file changed, 1 insertion(+) (limited to 'user_guide_src') diff --git a/user_guide_src/source/changelog.rst b/user_guide_src/source/changelog.rst index fd7485f64..77648a937 100644 --- a/user_guide_src/source/changelog.rst +++ b/user_guide_src/source/changelog.rst @@ -12,6 +12,7 @@ Bug fixes for 3.1.6 ------------------- - Fixed a bug (#5164) - :doc:`Loader Library ` method ``library()`` ignored requests to load libraries previously assigned to super-object properties named differently than the library name. +- Fixed a bug (#5168) - :doc:`Query Builder ` method ``count_all_results()`` produced erroneous queries on Microsoft SQL Server when ``ORDER BY`` clauses are cached. Version 3.1.5 ============= -- cgit v1.2.3-24-g4f1b From 93d759dd84dc1eefb5f968d70177973a84c1df70 Mon Sep 17 00:00:00 2001 From: Andrey Andreev Date: Thu, 6 Jul 2017 11:54:16 +0300 Subject: [ci skip] Add changelog entry for PR #5170 --- user_guide_src/source/changelog.rst | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'user_guide_src') diff --git a/user_guide_src/source/changelog.rst b/user_guide_src/source/changelog.rst index 77648a937..b1dc618b2 100644 --- a/user_guide_src/source/changelog.rst +++ b/user_guide_src/source/changelog.rst @@ -7,6 +7,10 @@ Version 3.1.6 Release Date: Not Released +- General Changes + + - Updated the :doc:`Session Library ` 'redis', 'memcached' drivers to reduce the potential of a locking race conditions. + Bug fixes for 3.1.6 ------------------- -- cgit v1.2.3-24-g4f1b From e5b9f66a92c6352ca725520db4d9390247088a5a Mon Sep 17 00:00:00 2001 From: Andrey Andreev Date: Mon, 10 Jul 2017 14:42:14 +0300 Subject: [ci skip] Add changelog entry for #5128 --- user_guide_src/source/changelog.rst | 1 + 1 file changed, 1 insertion(+) (limited to 'user_guide_src') diff --git a/user_guide_src/source/changelog.rst b/user_guide_src/source/changelog.rst index b1dc618b2..c6c339f07 100644 --- a/user_guide_src/source/changelog.rst +++ b/user_guide_src/source/changelog.rst @@ -17,6 +17,7 @@ Bug fixes for 3.1.6 - Fixed a bug (#5164) - :doc:`Loader Library ` method ``library()`` ignored requests to load libraries previously assigned to super-object properties named differently than the library name. - Fixed a bug (#5168) - :doc:`Query Builder ` method ``count_all_results()`` produced erroneous queries on Microsoft SQL Server when ``ORDER BY`` clauses are cached. +- Fixed a bug (#5128) - :doc:`Profiler ` didn't wrap ``$_SESSION`` and configuration arrays in ``
`` tags.
 
 Version 3.1.5
 =============
-- 
cgit v1.2.3-24-g4f1b


From 29740e442a1d78bd65b569c92575cdbf4fc2d614 Mon Sep 17 00:00:00 2001
From: Andrey Andreev 
Date: Fri, 14 Jul 2017 13:08:35 +0300
Subject: [ci skip] Add changelog entry for #5183

---
 user_guide_src/source/changelog.rst | 1 +
 1 file changed, 1 insertion(+)

(limited to 'user_guide_src')

diff --git a/user_guide_src/source/changelog.rst b/user_guide_src/source/changelog.rst
index c6c339f07..828c9d30d 100644
--- a/user_guide_src/source/changelog.rst
+++ b/user_guide_src/source/changelog.rst
@@ -18,6 +18,7 @@ Bug fixes for 3.1.6
 -  Fixed a bug (#5164) - :doc:`Loader Library ` method ``library()`` ignored requests to load libraries previously assigned to super-object properties named differently than the library name.
 -  Fixed a bug (#5168) - :doc:`Query Builder ` method ``count_all_results()`` produced erroneous queries on Microsoft SQL Server when ``ORDER BY`` clauses are cached.
 -  Fixed a bug (#5128) - :doc:`Profiler ` didn't wrap ``$_SESSION`` and configuration arrays in ``
`` tags.
+-  Fixed a bug (#5183) - :doc:`Database Library ` method ``is_write_type()`` didn't return TRUE for ``MERGE`` statements.
 
 Version 3.1.5
 =============
-- 
cgit v1.2.3-24-g4f1b


From 6cab78970f212a30ea923835510ffd1fb77a6ad0 Mon Sep 17 00:00:00 2001
From: Andrey Andreev 
Date: Mon, 17 Jul 2017 13:14:00 +0300
Subject: [ci skip] escapeshellarg on the image src path passed to NetPBM by
 Image_lib

---
 user_guide_src/source/changelog.rst | 1 +
 1 file changed, 1 insertion(+)

(limited to 'user_guide_src')

diff --git a/user_guide_src/source/changelog.rst b/user_guide_src/source/changelog.rst
index 828c9d30d..d6984bb7b 100644
--- a/user_guide_src/source/changelog.rst
+++ b/user_guide_src/source/changelog.rst
@@ -19,6 +19,7 @@ Bug fixes for 3.1.6
 -  Fixed a bug (#5168) - :doc:`Query Builder ` method ``count_all_results()`` produced erroneous queries on Microsoft SQL Server when ``ORDER BY`` clauses are cached.
 -  Fixed a bug (#5128) - :doc:`Profiler ` didn't wrap ``$_SESSION`` and configuration arrays in ``
`` tags.
 -  Fixed a bug (#5183) - :doc:`Database Library ` method ``is_write_type()`` didn't return TRUE for ``MERGE`` statements.
+-  Fixed a bug where :doc:`Image Manipulation Library ` didn't escape image source paths passed to NetPBM as shell arguments.
 
 Version 3.1.5
 =============
-- 
cgit v1.2.3-24-g4f1b


From 954c4aac3211c5e04270c76b9f7ac11466638bef Mon Sep 17 00:00:00 2001
From: Andrey Andreev 
Date: Fri, 21 Jul 2017 11:51:37 +0300
Subject: [ci skip] Merge pull request #5191 from jim-parry/patch/docs

Fix some mistakes in the user guide
---
 user_guide_src/source/database/query_builder.rst | 2 +-
 user_guide_src/source/general/urls.rst           | 6 +++---
 user_guide_src/source/libraries/input.rst        | 2 +-
 user_guide_src/source/libraries/loader.rst       | 2 +-
 4 files changed, 6 insertions(+), 6 deletions(-)

(limited to 'user_guide_src')

diff --git a/user_guide_src/source/database/query_builder.rst b/user_guide_src/source/database/query_builder.rst
index 3135f76da..1b79c893a 100644
--- a/user_guide_src/source/database/query_builder.rst
+++ b/user_guide_src/source/database/query_builder.rst
@@ -119,7 +119,7 @@ escaping of fields may break them.
 
 ::
 
-	$this->db->select('(SELECT SUM(payments.amount) FROM payments WHERE payments.invoice_id=4') AS amount_paid', FALSE);
+	$this->db->select('(SELECT SUM(payments.amount) FROM payments WHERE payments.invoice_id=4) AS amount_paid', FALSE);
 	$query = $this->db->get('mytable');
 
 **$this->db->select_max()**
diff --git a/user_guide_src/source/general/urls.rst b/user_guide_src/source/general/urls.rst
index ca44e2f4c..e23554907 100644
--- a/user_guide_src/source/general/urls.rst
+++ b/user_guide_src/source/general/urls.rst
@@ -42,10 +42,10 @@ By default, the **index.php** file will be included in your URLs::
 If your Apache server has *mod_rewrite* enabled, you can easily remove this
 file by using a .htaccess file with some simple rules. Here is an example
 of such a file, using the "negative" method in which everything is redirected
-except the specified items:
-
-::
+except the specified items::
 	
+.. code-block:: console
+
 	RewriteEngine On
 	RewriteCond %{REQUEST_FILENAME} !-f
 	RewriteCond %{REQUEST_FILENAME} !-d
diff --git a/user_guide_src/source/libraries/input.rst b/user_guide_src/source/libraries/input.rst
index e7107fa06..300f47112 100644
--- a/user_guide_src/source/libraries/input.rst
+++ b/user_guide_src/source/libraries/input.rst
@@ -245,7 +245,7 @@ Class Reference
 		data::
 
 			$this->input->cookie('some_cookie');
-			$this->input->cookie('some_cookie, TRUE); // with XSS filter
+			$this->input->cookie('some_cookie', TRUE); // with XSS filter
 
 		To return an array of multiple cookie values, pass all the required keys
 		as an array.
diff --git a/user_guide_src/source/libraries/loader.rst b/user_guide_src/source/libraries/loader.rst
index 228d5e478..22abb4586 100644
--- a/user_guide_src/source/libraries/loader.rst
+++ b/user_guide_src/source/libraries/loader.rst
@@ -125,7 +125,7 @@ Class Reference
 
 			$config = array (
 				'mailtype' => 'html',
-				'charset'  => 'utf-8,
+				'charset'  => 'utf-8',
 				'priority' => '1'
 			);
 
-- 
cgit v1.2.3-24-g4f1b


From 2f473195dcf6ed83fb31f90dce5b226f3e486ff0 Mon Sep 17 00:00:00 2001
From: Andrey Andreev 
Date: Fri, 21 Jul 2017 11:59:51 +0300
Subject: [ci skip] Merge pull request #5188 from
 ryanbriscall/update-sphinx-version-userguide-src
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

updates version of sphinx to 1.6.3 for easyinstall command in step 2 …
---
 user_guide_src/README.rst | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

(limited to 'user_guide_src')

diff --git a/user_guide_src/README.rst b/user_guide_src/README.rst
index d645adb73..b31db7cf8 100644
--- a/user_guide_src/README.rst
+++ b/user_guide_src/README.rst
@@ -13,17 +13,19 @@ output it to various formats.  Pages are written in human-readable
 Prerequisites
 =============
 
-Sphinx requires Python, which is already installed if you are running OS X.
+Sphinx requires Python 2.7.  If you are on OS X, then you already have Python.
 You can confirm in a Terminal window by executing the ``python`` command
 without any parameters.  It should load up and tell you which version you have
-installed.  If you're not on 2.7+, go ahead and install 2.7.2 from
-http://python.org/download/releases/2.7.2/
+installed.
+
+Note: If you're not on Python 2.7, then you must upgrade. E.g. Install 2.7.2
+from http://python.org/download/releases/2.7.2/
 
 Installation
 ============
 
 1. Install `easy_install `_
-2. ``easy_install "sphinx==1.2.3"``
+2. ``easy_install "sphinx==1.6.3"``
 3. ``easy_install "sphinxcontrib-phpdomain==0.1.3.post1"``
 4. Install the CI Lexer which allows PHP, HTML, CSS, and JavaScript syntax highlighting in code examples (see *cilexer/README*)
 5. ``cd user_guide_src``
-- 
cgit v1.2.3-24-g4f1b


From 613b898234debcaea5ec9160e5249358ac7e3dfc Mon Sep 17 00:00:00 2001
From: Andrey Andreev 
Date: Fri, 25 Aug 2017 13:24:51 +0300
Subject: [ci skip] Fix #5236

---
 user_guide_src/source/changelog.rst | 1 +
 1 file changed, 1 insertion(+)

(limited to 'user_guide_src')

diff --git a/user_guide_src/source/changelog.rst b/user_guide_src/source/changelog.rst
index d6984bb7b..9d6620662 100644
--- a/user_guide_src/source/changelog.rst
+++ b/user_guide_src/source/changelog.rst
@@ -20,6 +20,7 @@ Bug fixes for 3.1.6
 -  Fixed a bug (#5128) - :doc:`Profiler ` didn't wrap ``$_SESSION`` and configuration arrays in ``
`` tags.
 -  Fixed a bug (#5183) - :doc:`Database Library ` method ``is_write_type()`` didn't return TRUE for ``MERGE`` statements.
 -  Fixed a bug where :doc:`Image Manipulation Library ` didn't escape image source paths passed to NetPBM as shell arguments.
+-  Fixed a bug (#5236) - :doc:`Query Builder ` methods ``limit()``, ``offset()`` break SQL Server 2005, 2008 queries with ``"".*`` in the ``SELECT`` clause.
 
 Version 3.1.5
 =============
-- 
cgit v1.2.3-24-g4f1b


From c4e7999ded26a1acbefdf7f9eebb69772860bb23 Mon Sep 17 00:00:00 2001
From: Andrey Andreev 
Date: Thu, 31 Aug 2017 16:05:37 +0300
Subject: [ci skip] Add changelog entry for #5243

---
 user_guide_src/source/changelog.rst | 1 +
 1 file changed, 1 insertion(+)

(limited to 'user_guide_src')

diff --git a/user_guide_src/source/changelog.rst b/user_guide_src/source/changelog.rst
index 9d6620662..64c98e127 100644
--- a/user_guide_src/source/changelog.rst
+++ b/user_guide_src/source/changelog.rst
@@ -21,6 +21,7 @@ Bug fixes for 3.1.6
 -  Fixed a bug (#5183) - :doc:`Database Library ` method ``is_write_type()`` didn't return TRUE for ``MERGE`` statements.
 -  Fixed a bug where :doc:`Image Manipulation Library ` didn't escape image source paths passed to NetPBM as shell arguments.
 -  Fixed a bug (#5236) - :doc:`Query Builder ` methods ``limit()``, ``offset()`` break SQL Server 2005, 2008 queries with ``"".*`` in the ``SELECT`` clause.
+-  Fixed a bug (#5243) - :doc:`Database Library ` method ``version()`` didn't work with the 'pdo/dblib' driver.
 
 Version 3.1.5
 =============
-- 
cgit v1.2.3-24-g4f1b


From 5e88ea5b2d8c75c896094036ff7c4c3e0254258f Mon Sep 17 00:00:00 2001
From: Andrey Andreev 
Date: Mon, 4 Sep 2017 15:13:37 +0300
Subject: Fix #5246

---
 user_guide_src/source/changelog.rst | 1 +
 1 file changed, 1 insertion(+)

(limited to 'user_guide_src')

diff --git a/user_guide_src/source/changelog.rst b/user_guide_src/source/changelog.rst
index 64c98e127..372ceeb3b 100644
--- a/user_guide_src/source/changelog.rst
+++ b/user_guide_src/source/changelog.rst
@@ -22,6 +22,7 @@ Bug fixes for 3.1.6
 -  Fixed a bug where :doc:`Image Manipulation Library ` didn't escape image source paths passed to NetPBM as shell arguments.
 -  Fixed a bug (#5236) - :doc:`Query Builder ` methods ``limit()``, ``offset()`` break SQL Server 2005, 2008 queries with ``"".*`` in the ``SELECT`` clause.
 -  Fixed a bug (#5243) - :doc:`Database Library ` method ``version()`` didn't work with the 'pdo/dblib' driver.
+-  Fixed a bug (#5246) - :doc:`Database transactions ` status wasn't reset unless ``trans_complete()`` was called.
 
 Version 3.1.5
 =============
-- 
cgit v1.2.3-24-g4f1b


From 9385cfed8e61c4568d5ec93c8ee8900f314a5a5a Mon Sep 17 00:00:00 2001
From: Andrey Andreev 
Date: Wed, 13 Sep 2017 13:17:28 +0300
Subject: Fix #5260

---
 user_guide_src/source/changelog.rst | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'user_guide_src')

diff --git a/user_guide_src/source/changelog.rst b/user_guide_src/source/changelog.rst
index 372ceeb3b..055e2d08c 100644
--- a/user_guide_src/source/changelog.rst
+++ b/user_guide_src/source/changelog.rst
@@ -23,6 +23,8 @@ Bug fixes for 3.1.6
 -  Fixed a bug (#5236) - :doc:`Query Builder ` methods ``limit()``, ``offset()`` break SQL Server 2005, 2008 queries with ``"".*`` in the ``SELECT`` clause.
 -  Fixed a bug (#5243) - :doc:`Database Library ` method ``version()`` didn't work with the 'pdo/dblib' driver.
 -  Fixed a bug (#5246) - :doc:`Database transactions ` status wasn't reset unless ``trans_complete()`` was called.
+-  Fixed a bug (#5260) - :doc:`Database Utilities ` method ``backup()`` generated incorrect ``INSERT`` statements with the 'mysqli' driver.
+-  Fixed a bug where :doc:`Database Results ` method ``field_data()`` didn't parse field types with the 'mysqli' driver.
 
 Version 3.1.5
 =============
-- 
cgit v1.2.3-24-g4f1b


From e8eb86764955c9c904b50db7c12a3be73c627406 Mon Sep 17 00:00:00 2001
From: Andrey Andreev 
Date: Sat, 16 Sep 2017 17:27:29 +0300
Subject: [ci skip] Merge pull request #5265 from mehdibo/patch-1

Fixed dbprefix() documentation
---
 user_guide_src/source/database/queries.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'user_guide_src')

diff --git a/user_guide_src/source/database/queries.rst b/user_guide_src/source/database/queries.rst
index f626f1e83..710ababb0 100644
--- a/user_guide_src/source/database/queries.rst
+++ b/user_guide_src/source/database/queries.rst
@@ -66,7 +66,7 @@ the following::
 If for any reason you would like to change the prefix programatically
 without needing to create a new connection, you can use this method::
 
-	$this->db->set_dbprefix('newprefix');
+	$this->db->set_dbprefix('newprefix_');
 	$this->db->dbprefix('tablename'); // outputs newprefix_tablename
 
 
-- 
cgit v1.2.3-24-g4f1b


From 88c1a597360f5b63371c119b64e913c9238c75b8 Mon Sep 17 00:00:00 2001
From: Andrey Andreev 
Date: Mon, 25 Sep 2017 14:39:34 +0300
Subject: [ci skip] Fix potential object injection in apc cache driver;
 deprecate the apc driver

---
 user_guide_src/source/changelog.rst | 5 +++++
 1 file changed, 5 insertions(+)

(limited to 'user_guide_src')

diff --git a/user_guide_src/source/changelog.rst b/user_guide_src/source/changelog.rst
index 055e2d08c..dcfe7b481 100644
--- a/user_guide_src/source/changelog.rst
+++ b/user_guide_src/source/changelog.rst
@@ -7,8 +7,13 @@ Version 3.1.6
 
 Release Date: Not Released
 
+-  **Security**
+
+   -  Fixed a potential object injection in :doc:`Cache Library ` 'apc' driver when ``save()`` is used with ``$raw = TRUE`` (thanks to Tomas Bortoli).
+
 -  General Changes
 
+   -  Deprecated :doc:`Cache Library Library ` driver 'apc'.
    -  Updated the :doc:`Session Library ` 'redis', 'memcached' drivers to reduce the potential of a locking race conditions.
 
 
-- 
cgit v1.2.3-24-g4f1b


From dcc029d23128c1e66edb0138adb773d74c808c90 Mon Sep 17 00:00:00 2001
From: Andrey Andreev 
Date: Mon, 25 Sep 2017 14:47:31 +0300
Subject: [ci skip] Add upgrade instructions about the APC deprecation

---
 user_guide_src/source/installation/upgrade_316.rst | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

(limited to 'user_guide_src')

diff --git a/user_guide_src/source/installation/upgrade_316.rst b/user_guide_src/source/installation/upgrade_316.rst
index e382c20ab..1d86b5720 100644
--- a/user_guide_src/source/installation/upgrade_316.rst
+++ b/user_guide_src/source/installation/upgrade_316.rst
@@ -12,3 +12,17 @@ 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.
+
+Step 2: Remove usage of the APC Cache driver (deprecation)
+==========================================================
+
+The :doc:`Cache Library <../libraries/caching>` APC driver is now
+deprecated, as the APC extension is effectively dead, as explained in its
+`PHP Manual page `_.
+
+If your application happens to be using it, you can switch to another
+cache driver, as APC support will be removed in a future CodeIgniter
+version.
+
+.. note:: The driver is still available, but you're strongly encouraged
+	to remove its usage sooner rather than later.
-- 
cgit v1.2.3-24-g4f1b


From cf728703b5852591c160cbd9566a0e508dd5759a Mon Sep 17 00:00:00 2001
From: Andrey Andreev 
Date: Mon, 25 Sep 2017 19:37:44 +0300
Subject: [ci skip] Prepare 3.1.6 release

---
 user_guide_src/source/changelog.rst              | 2 +-
 user_guide_src/source/conf.py                    | 4 ++--
 user_guide_src/source/installation/downloads.rst | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

(limited to 'user_guide_src')

diff --git a/user_guide_src/source/changelog.rst b/user_guide_src/source/changelog.rst
index dcfe7b481..e5387cc5a 100644
--- a/user_guide_src/source/changelog.rst
+++ b/user_guide_src/source/changelog.rst
@@ -5,7 +5,7 @@ Change Log
 Version 3.1.6
 =============
 
-Release Date: Not Released
+Release Date: Sep 25, 2017
 
 -  **Security**
 
diff --git a/user_guide_src/source/conf.py b/user_guide_src/source/conf.py
index f783d67e7..7929f8ae7 100644
--- a/user_guide_src/source/conf.py
+++ b/user_guide_src/source/conf.py
@@ -48,9 +48,9 @@ copyright = u'2014 - 2017, British Columbia Institute of Technology'
 # built documents.
 #
 # The short X.Y version.
-version = '3.1.6-dev'
+version = '3.1.6'
 # The full version, including alpha/beta/rc tags.
-release = '3.1.6-dev'
+release = '3.1.6'
 
 # 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 23c500e12..76335bb67 100644
--- a/user_guide_src/source/installation/downloads.rst
+++ b/user_guide_src/source/installation/downloads.rst
@@ -2,7 +2,7 @@
 Downloading CodeIgniter
 #######################
 
--  `CodeIgniter v3.1.6-dev (Current version) `_
+-  `CodeIgniter v3.1.6 (Current version) `_
 -  `CodeIgniter v3.1.5 `_
 -  `CodeIgniter v3.1.4 `_
 -  `CodeIgniter v3.1.3 `_
-- 
cgit v1.2.3-24-g4f1b


From 4131d42c793c3db50b6184e5084332d5415c91cb Mon Sep 17 00:00:00 2001
From: Andrey Andreev 
Date: Mon, 25 Sep 2017 19:47:49 +0300
Subject: [ci skip] Mark the start of 3.1.7-dev

---
 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_317.rst | 14 ++++++++++++++
 user_guide_src/source/installation/upgrading.rst   |  1 +
 5 files changed, 25 insertions(+), 3 deletions(-)
 create mode 100644 user_guide_src/source/installation/upgrade_317.rst

(limited to 'user_guide_src')

diff --git a/user_guide_src/source/changelog.rst b/user_guide_src/source/changelog.rst
index e5387cc5a..b99a709ad 100644
--- a/user_guide_src/source/changelog.rst
+++ b/user_guide_src/source/changelog.rst
@@ -2,6 +2,12 @@
 Change Log
 ##########
 
+Version 3.1.7
+=============
+
+Release Date: Not Released
+
+
 Version 3.1.6
 =============
 
diff --git a/user_guide_src/source/conf.py b/user_guide_src/source/conf.py
index 7929f8ae7..e2b1c2972 100644
--- a/user_guide_src/source/conf.py
+++ b/user_guide_src/source/conf.py
@@ -48,9 +48,9 @@ copyright = u'2014 - 2017, British Columbia Institute of Technology'
 # built documents.
 #
 # The short X.Y version.
-version = '3.1.6'
+version = '3.1.7-dev'
 # The full version, including alpha/beta/rc tags.
-release = '3.1.6'
+release = '3.1.7-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 76335bb67..bb7534d91 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.6 (Current version) `_
+-  `CodeIgniter v3.1.7-dev (Current version) `_
+-  `CodeIgniter v3.1.6 `_
 -  `CodeIgniter v3.1.5 `_
 -  `CodeIgniter v3.1.4 `_
 -  `CodeIgniter v3.1.3 `_
diff --git a/user_guide_src/source/installation/upgrade_317.rst b/user_guide_src/source/installation/upgrade_317.rst
new file mode 100644
index 000000000..93c37b687
--- /dev/null
+++ b/user_guide_src/source/installation/upgrade_317.rst
@@ -0,0 +1,14 @@
+#############################
+Upgrading from 3.1.6 to 3.1.7
+#############################
+
+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 991d5cf4c..1cc249869 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.6 to 3.1.7 
 	Upgrading from 3.1.5 to 3.1.6 
 	Upgrading from 3.1.4 to 3.1.5 
 	Upgrading from 3.1.3 to 3.1.4 
-- 
cgit v1.2.3-24-g4f1b