Prepare for 3.1.0 release

8 files changed, 37 insertions, 24 deletions

diff --git a/readme.rst b/readme.rst
index 526950e67..7a376322d 100644
--- a/readme.rst
+++ b/readme.rst
@@ -29,7 +29,7 @@ guide change log <https://github.com/bcit-ci/CodeIgniter/blob/develop/user_guide
 Server Requirements
 *******************
 
-PHP version 5.4 or newer is recommended.
+PHP version 5.6 or newer is recommended.
 
 It should work on 5.2.4 as well, but we strongly advise you NOT to run
 such old versions of PHP, because of potential security and performance
@@ -67,4 +67,4 @@ Acknowledgement
 ***************
 
 The CodeIgniter team would like to thank EllisLab, all the
-contributors to the CodeIgniter project and you, the CodeIgniter user.
\ No newline at end of file
+contributors to the CodeIgniter project and you, the CodeIgniter user.
diff --git a/system/core/CodeIgniter.php b/system/core/CodeIgniter.php
index aef0d3a5d..2525edae2 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
  *
  */
-	define('CI_VERSION', '3.0.7-dev');
+	define('CI_VERSION', '3.1.0');
 
 /*
  * ------------------------------------------------------
diff --git a/user_guide_src/source/changelog.rst b/user_guide_src/source/changelog.rst
index 156b6be56..76aeecbcb 100644
--- a/user_guide_src/source/changelog.rst
+++ b/user_guide_src/source/changelog.rst
@@ -2,10 +2,10 @@
 Change Log
 ##########
 
-Version 3.0.7
+Version 3.1.0
 =============
 
-Release Date: Not Released
+Release Date: July 26, 2016
 
 -  **Security**
 
@@ -26,7 +26,7 @@ Release Date: Not Released
       - Changed salt-generation logic to prefer direct access to */dev/urandom* over ``openssl_random_pseudo_bytes()``.
       - Changed salt-generation logic to error if ``openssl_random_pseudo_bytes()`` sets its ``$crypto_strong`` flag to FALSE.
 
-Bug fixes for 3.0.7
+Bug fixes for 3.1.0
 -------------------
 
 -  Fixed a bug where :doc:`Image Manipulation Library <libraries/image_lib>` didn't escape image source paths passed to ImageMagick as shell arguments.
diff --git a/user_guide_src/source/conf.py b/user_guide_src/source/conf.py
index 26f854d85..9e78d242d 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.0.7-dev'
+version = '3.1.0'
 # The full version, including alpha/beta/rc tags.
-release = '3.0.7-dev'
+release = '3.1.0'
 
 # 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 22c63b873..80d2412cd 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.0.7-dev (Current version) <https://codeload.github.com/bcit-ci/CodeIgniter/zip/3.0-stable>`_
+-  `CodeIgniter v3.1.0 (Current version) <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_307.rst b/user_guide_src/source/installation/upgrade_307.rst
deleted file mode 100644
index ee957aabf..000000000
--- a/user_guide_src/source/installation/upgrade_307.rst
+++ /dev/null
@@ -1,14 +0,0 @@
-#############################
-Upgrading from 3.0.6 to 3.0.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/upgrade_310.rst b/user_guide_src/source/installation/upgrade_310.rst
new file mode 100644
index 000000000..1dc71a58c
--- /dev/null
+++ b/user_guide_src/source/installation/upgrade_310.rst
@@ -0,0 +1,27 @@
+#############################
+Upgrading from 3.0.6 to 3.1.0
+#############################
+
+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.
+
+Step 2: If you're using the 'odbc' database driver, check for usage of Query Builder
+====================================================================================
+
+:doc:`Query Builder <../database/query_builder>` functionality and ``escape()`` can
+no longer be used with the 'odbc' database driver.
+
+This is because, due to its nature, the `ODBC extension for PHP <https://secure.php.net/odbc>`_
+does not provide a function that allows to safely escape user-supplied strings for usage
+inside an SQL query (which our :doc:`Query Builder <database/query_builder>` relies on).
+
+Thus, user inputs MUST be bound, as shown in :doc:`Running Queries <../database/queries>`,
+under the "Query Bindings" section.
\ No newline at end of file
diff --git a/user_guide_src/source/installation/upgrading.rst b/user_guide_src/source/installation/upgrading.rst
index 5beca6586..f0cf8c903 100644
--- a/user_guide_src/source/installation/upgrading.rst
+++ b/user_guide_src/source/installation/upgrading.rst
@@ -8,7 +8,7 @@ upgrading from.
 .. toctree::
 	:titlesonly:
 
-	Upgrading from 3.0.6 to 3.0.7 <upgrade_307>
+	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>
 	Upgrading from 3.0.3 to 3.0.4 <upgrade_304>