summaryrefslogtreecommitdiffstats
path: root/user_guide_src
diff options
context:
space:
mode:
authorAndrey Andreev <narf@devilix.net>2016-10-28 17:14:13 +0200
committerAndrey Andreev <narf@devilix.net>2016-10-28 17:14:13 +0200
commit8ec72f2ee46984ed0ca9abc5a01742e56fa0c300 (patch)
tree43bd6d55f6eea11239a757304427c7c5f0cab63e /user_guide_src
parentb6995a6a1bdfb2275b3befb89d51da0a1769771e (diff)
parent014be1e8726ebce6dd19284ae3deaee866d6b0e5 (diff)
Merge branch 'release/3.1.2' into 3.1-stable
Diffstat (limited to 'user_guide_src')
-rw-r--r--user_guide_src/source/changelog.rst4
-rw-r--r--user_guide_src/source/conf.py4
-rw-r--r--user_guide_src/source/installation/downloads.rst2
3 files changed, 5 insertions, 5 deletions
diff --git a/user_guide_src/source/changelog.rst b/user_guide_src/source/changelog.rst
index 4be0b31d3..437fdbabe 100644
--- a/user_guide_src/source/changelog.rst
+++ b/user_guide_src/source/changelog.rst
@@ -5,11 +5,11 @@ Change Log
Version 3.1.2
=============
-Release Date: Not Released
+Release Date: Oct 28, 2016
- **Security**
- - Fixed a new URL-encoding attack vector in :doc:`Security Library <libraries/security>` method ``xss_clean()`` affecting Firefox.
+ - Fixed a number of new vulnerabilities in :doc:`Security Library <libraries/security>` method ``xss_clean()``.
- General Changes
diff --git a/user_guide_src/source/conf.py b/user_guide_src/source/conf.py
index 17771fa9e..2f44e0cbe 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.1.2-dev'
+version = '3.1.2'
# The full version, including alpha/beta/rc tags.
-release = '3.1.2-dev'
+release = '3.1.2'
# 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 1eacd4d33..6c1f007e3 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.2-dev (Current version) <https://codeload.github.com/bcit-ci/CodeIgniter/zip/3.1-stable>`_
+- `CodeIgniter v3.1.2 (Current version) <https://codeload.github.com/bcit-ci/CodeIgniter/zip/3.1.2>`_
- `CodeIgniter v3.1.1 <https://codeload.github.com/bcit-ci/CodeIgniter/zip/3.1.1>`_
- `CodeIgniter v3.1.0 <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>`_