summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndrey Andreev <narf@devilix.net>2016-01-13 01:13:10 +0100
committerAndrey Andreev <narf@devilix.net>2016-01-13 01:13:10 +0100
commit4307bff0a4ae884d57cc0c0fa8f54de6c05000e7 (patch)
tree6e937a8c4d1df47be6735b8a2b2162e65a0bfa53
parent1f91ac640ada20850fa651d249beea548a63d978 (diff)
[ci skip] Mark the start of 3.0.5 development
-rw-r--r--system/core/CodeIgniter.php2
-rw-r--r--user_guide_src/source/changelog.rst8
-rw-r--r--user_guide_src/source/conf.py4
-rw-r--r--user_guide_src/source/installation/downloads.rst3
-rw-r--r--user_guide_src/source/installation/upgrade_305.rst14
-rw-r--r--user_guide_src/source/installation/upgrading.rst1
6 files changed, 27 insertions, 5 deletions
diff --git a/system/core/CodeIgniter.php b/system/core/CodeIgniter.php
index 727f37029..52b542654 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.4-dev');
+ define('CI_VERSION', '3.0.5-dev');
/*
* ------------------------------------------------------
diff --git a/user_guide_src/source/changelog.rst b/user_guide_src/source/changelog.rst
index 3826fc66d..1ba85fa35 100644
--- a/user_guide_src/source/changelog.rst
+++ b/user_guide_src/source/changelog.rst
@@ -2,11 +2,17 @@
Change Log
##########
-Version 3.0.4
+Version 3.0.5
=============
Release Date: Not Released
+
+Version 3.0.4
+=============
+
+Release Date: January 13, 2016
+
- General Changes
- Updated :doc:`Security Library <libraries/security>` method ``get_random_bytes()`` to use PHP 7's ``random_bytes()`` function when possible.
diff --git a/user_guide_src/source/conf.py b/user_guide_src/source/conf.py
index 8a4c9db59..12339eb91 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.4-dev'
+version = '3.0.5-dev'
# The full version, including alpha/beta/rc tags.
-release = '3.0.4-dev'
+release = '3.0.5-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 00c98ab23..c7db54cd8 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.0.4-dev (Current version) <https://codeload.github.com/bcit-ci/CodeIgniter/zip/3.0-stable>`_
+- `CodeIgniter v3.0.5-dev (Current version) <https://codeload.github.com/bcit-ci/CodeIgniter/zip/3.0-stable>`_
+- `CodeIgniter v3.0.4 <https://codeload.github.com/bcit-ci/CodeIgniter/zip/3.0.4>`_
- `CodeIgniter v3.0.3 <https://codeload.github.com/bcit-ci/CodeIgniter/zip/3.0.3>`_
- `CodeIgniter v3.0.2 <https://codeload.github.com/bcit-ci/CodeIgniter/zip/3.0.2>`_
- `CodeIgniter v3.0.1 <https://codeload.github.com/bcit-ci/CodeIgniter/zip/3.0.1>`_
diff --git a/user_guide_src/source/installation/upgrade_305.rst b/user_guide_src/source/installation/upgrade_305.rst
new file mode 100644
index 000000000..a47982481
--- /dev/null
+++ b/user_guide_src/source/installation/upgrade_305.rst
@@ -0,0 +1,14 @@
+#############################
+Upgrading from 3.0.4 to 3.0.5
+#############################
+
+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 dd777346d..102f20abf 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.0.4 to 3.0.5 <upgrade_305>
Upgrading from 3.0.3 to 3.0.4 <upgrade_304>
Upgrading from 3.0.2 to 3.0.3 <upgrade_303>
Upgrading from 3.0.1 to 3.0.2 <upgrade_302>