summaryrefslogtreecommitdiffstats
path: root/user_guide_src/source/installation
diff options
context:
space:
mode:
authorDerek Jones <derek.jones@ellislab.com>2012-07-04 16:12:26 +0200
committerDerek Jones <derek.jones@ellislab.com>2012-07-04 16:12:26 +0200
commit36d1ac94a8b55485db30677a72bc3d57c3bb3cf8 (patch)
treea51308f576cc05cba9b5477d6eba9bbd192654a7 /user_guide_src/source/installation
parent6801d044d7f7b905e1fdaf21231f8a3fad5b4057 (diff)
parent1a85653e093d0f9b4028d808b57747cdbff17a65 (diff)
Merge branch 'feature/user-guide-work' into develop
Conflicts: user_guide_src/source/installation/upgrade_210.rst user_guide_src/source/installation/upgrade_211.rst user_guide_src/source/installation/upgrade_212.rst
Diffstat (limited to 'user_guide_src/source/installation')
-rw-r--r--user_guide_src/source/installation/upgrade_210.rst12
-rw-r--r--user_guide_src/source/installation/upgrade_211.rst2
-rw-r--r--user_guide_src/source/installation/upgrade_212.rst8
-rw-r--r--user_guide_src/source/installation/upgrading.rst1
4 files changed, 17 insertions, 6 deletions
diff --git a/user_guide_src/source/installation/upgrade_210.rst b/user_guide_src/source/installation/upgrade_210.rst
index 647537d1f..5874bfc86 100644
--- a/user_guide_src/source/installation/upgrade_210.rst
+++ b/user_guide_src/source/installation/upgrade_210.rst
@@ -8,9 +8,7 @@ replacing the index.php file with a static one.
Step 1: Update your CodeIgniter files
=====================================
-Replace all files and directories in your "system" folder and replace
-your index.php file. If any modifications were made to your index.php
-they will need to be made fresh in this new one.
+Replace all files and directories in your "system" folder.
.. note:: If you have any custom developed files in these folders please
make copies of them first.
@@ -19,4 +17,10 @@ Step 2: Replace config/user_agents.php
======================================
This config file has been updated to contain more user agent types,
-please copy it to _application/config/user_agents.php*. \ No newline at end of file
+please copy it to _application/config/user_agents.php*.
+
+Step 3: Update your user guide
+==============================
+
+Please also replace your local copy of the user guide with the new
+version. \ No newline at end of file
diff --git a/user_guide_src/source/installation/upgrade_211.rst b/user_guide_src/source/installation/upgrade_211.rst
index 80248a758..59faca8e6 100644
--- a/user_guide_src/source/installation/upgrade_211.rst
+++ b/user_guide_src/source/installation/upgrade_211.rst
@@ -30,4 +30,4 @@ session table will need to change
::
- ALTER TABLE ci_sessions CHANGE ip_address ip_address varchar(45) default '0' NOT NULL
+ ALTER TABLE ci_sessions CHANGE ip_address ip_address varchar(45) default '0' NOT NULL \ No newline at end of file
diff --git a/user_guide_src/source/installation/upgrade_212.rst b/user_guide_src/source/installation/upgrade_212.rst
index cdbf977d7..205ad8622 100644
--- a/user_guide_src/source/installation/upgrade_212.rst
+++ b/user_guide_src/source/installation/upgrade_212.rst
@@ -13,4 +13,10 @@ your index.php file. If any modifications were made to your index.php
they will need to be made fresh in this new one.
.. note:: If you have any custom developed files in these folders please
- make copies of them first. \ No newline at end of file
+ make copies of them first.
+
+Step 2: Update your user guide
+==============================
+
+Please also replace your local copy of the user guide with the new
+version. \ 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 3609e4213..545f344ee 100644
--- a/user_guide_src/source/installation/upgrading.rst
+++ b/user_guide_src/source/installation/upgrading.rst
@@ -8,6 +8,7 @@ upgrading from.
- :doc:`Upgrading from 2.1.2 to 3.0.0 <upgrade_300>`
- :doc:`Upgrading from 2.1.1 to 2.1.2 <upgrade_212>`
- :doc:`Upgrading from 2.1.0 to 2.1.1 <upgrade_211>`
+- :doc:`Upgrading from 2.0.3 to 2.1.0 <upgrade_210>`
- :doc:`Upgrading from 2.0.2 to 2.0.3 <upgrade_203>`
- :doc:`Upgrading from 2.0.1 to 2.0.2 <upgrade_202>`
- :doc:`Upgrading from 2.0 to 2.0.1 <upgrade_201>`