From d514652139066ef858f65d9a9eab07f98ffdece6 Mon Sep 17 00:00:00 2001
From: Yannick Warnier <ywarnier@beeznest.org>
Date: Mon, 26 Jan 2015 01:57:07 -0500
Subject: [PATCH] More changes for 1.10 version

---
 documentation/credits.html            |  5 ++++
 documentation/index.html              |  2 +-
 documentation/installation_guide.html | 42 +++++++++++++--------------
 3 files changed, 27 insertions(+), 22 deletions(-)

diff --git a/documentation/credits.html b/documentation/credits.html
index da1d96fe4b..c43c1714b3 100755
--- a/documentation/credits.html
+++ b/documentation/credits.html
@@ -58,6 +58,11 @@ In the following credits, when possible, we tried to put the latest contributors
 <a name="core-developers"></a>
 <h1>Core contributors / Core team</h1>
 <p>The core contributors are the people who contributed most to the Chamilo software. We are eternally thankful to them for having demonstrated a very high level of commitment, contributing their time and ideas to the project. Since version 1.9, we also include non-developer contributors as we consider their help is essential to the success of our project. This list is updated with each version.</p>
+<h2>Chamilo LMS 1.10.*</h2>
+<ul>
+  <li>Yannick Warnier (yannick.warnier@beeznest.com) - Technical coordinator, Project Leader - BeezNest, Belgium/Peru</li>
+  <li>Julio Allen Montoya Armas (gugli100@gmail.com) - Lead developer - BeezNest, France</li>
+</ul>
 <h2>Chamilo LMS 1.9.*</h2>
 <ul>
   <li>Yannick Warnier (yannick.warnier@beeznest.com) - Technical coordinator, Project Leader - BeezNest, Belgium/Peru</li>
diff --git a/documentation/index.html b/documentation/index.html
index 00e20b186e..0684011082 100755
--- a/documentation/index.html
+++ b/documentation/index.html
@@ -33,7 +33,7 @@
 <div class="container">
     <div class="row">
         <div class="hero-unit">
-            <h1>Chamilo 1.9 - Documentation</h1>
+            <h1>Chamilo 1.10 - Documentation</h1>
             <br />
 
             <a class="btn btn-primary btn-large" href="installation_guide.html">English installation guide</a>
diff --git a/documentation/installation_guide.html b/documentation/installation_guide.html
index 6e47666416..c72e1b9d07 100755
--- a/documentation/installation_guide.html
+++ b/documentation/installation_guide.html
@@ -326,7 +326,7 @@ previous version of Chamilo LMS (1.*) or Dok€os (&lt;2.0)</h2>
 Before upgrading, we <b>heavily</b> recommend you do a full backup of the previous
 Chamilo or Dok€os directories and databases. If you are unsure how to achieve this
 please ask your hosting provider for advice.<br />
-<em>Chamilo LMS 1.9 comes with a new database structure in comparison to 1.8. 
+<em>Chamilo LMS 1.10 comes with a new database structure in comparison to 1.9, and so between 1.9 and 1.8. 
 Although the upgrade script takes the migration in charge, it might be generating
 a very heavy load on your server during the upgrade, and will change your 
 database completely, preserving the data as well as possible (we have tested 
@@ -346,30 +346,30 @@ please contact one of the Chamilo Association's official providers &lt;providers
 
 <p></p>
 
-<h3>3.1 Upgrading from Chamilo 1.9.x (minor upgrade)</h3>
-As this is only a minor version change from previous 1.9.* versions of Chamilo, the only thing you need to do is:
+<h3>3.1 Upgrading from Chamilo 1.10.x (minor upgrade)</h3>
+As this is only a minor version change from previous 1.10.* versions of Chamilo, the only thing you need to do is:
 <ul>
   <li> check that you haven't left any customised stylesheet or image <span class="muted">(if you have, make sure you keep a copy on the side*)</span></li>
-  <li> download the Chamilo 1.9 install package from the <a href="http://www.chamilo.org/download">Chamilo download page</a></li>
-  <li> unzip the new files of Chamilo 1.9 over the files of the older version
+  <li> download the Chamilo 1.10 install package from the <a href="http://www.chamilo.org/download">Chamilo download page</a></li>
+  <li> unzip the new files of Chamilo 1.10 over the files of the older version
     (or unzip the files in one folder and then copy the files from there to the
     older version's directory). Note that you should remove the "home" and
     "searchdb" directories from the package before you overwrite the previous
     files.</li>
-  <li> edit the main/inc/conf/configuration.php file: at the en of the file, locate the previous version number (e.g. '1.9.4') and change it to this new version (e.g. '1.9.8')</li>
+  <li> edit the main/inc/conf/configuration.php file: at the en of the file, locate the previous version number (e.g. '1.10.4') and change it to this new version (e.g. '1.10.8')</li>
   <li> you're done! No other upgrade procedure is required</li>
 </ul>
 
 <br />
 
 
-<h3>3.2 Upgrading from Chamilo 1.8.x</h3>
+<h3>3.2 Upgrading from Chamilo 1.8.x or 1.9.x</h3>
 <ul>
   <li> check that you haven't left any customised stylesheet or image <span class="muted">(if you have, make sure you keep a copy on the side*)</span></li>
-  <li> download the Chamilo 1.9 install package from the <a href="http://www.chamilo.org/download">Chamilo download page</a></li>
-  <li> unzip the new files of Chamilo 1.9 over the files of the older version (or unzip the files in one folder and then copy the files from there to the older version's directory)</li>
+  <li> download the Chamilo 1.10 install package from the <a href="http://www.chamilo.org/download">Chamilo download page</a></li>
+  <li> unzip the new files of Chamilo 1.10 over the files of the older version (or unzip the files in one folder and then copy the files from there to the older version's directory)</li>
   <li> point your browser on your portal URL + main/install/</li>
-  <li> choose your language and click&nbsp;<span style="font-style: italic;">Upgrade from 1.8.x</span></li>
+  <li> choose your language and click&nbsp;<span style="font-style: italic;">Upgrade from 1.8.x/1.9.x</span></li>
 </ul>
 
 <br />
@@ -379,10 +379,10 @@ As this is only a minor version change from previous 1.9.* versions of Chamilo,
 <em>If you upgrade from Dok€os 1.8.x</em> :&nbsp;
 <ul>
   <li> check that you haven't left any customised stylesheet or image <span class="muted">(if you have, make sure you keep a copy on the side*)</span></li>
-  <li> download the Chamilo 1.9 install package from the <a href="http://www.chamilo.org/download">Chamilo download page</a></li>
-  <li> unzip the new files of Chamilo 1.9 over the files of the older version (or unzip the files in one folder and then copy the files from there to the older version's directory)</li>
+  <li> download the Chamilo 1.10 install package from the <a href="http://www.chamilo.org/download">Chamilo download page</a></li>
+  <li> unzip the new files of Chamilo 1.10 over the files of the older version (or unzip the files in one folder and then copy the files from there to the older version's directory)</li>
   <li> point your browser on your portal URL + main/install/</li>
-  <li> choose your language and click&nbsp;<span style="font-style: italic;">Upgrade from 1.8.x</span></li>
+  <li> choose your language and click&nbsp;<span style="font-style: italic;">Upgrade from 1.8.x/1.9.x</span></li>
 </ul>
 A bunch of Chamilo administrators have reported minor issues with the migration between versions considerably apart (like from Dok€os to Chamilo).
 This might include loosing some assignments or forum posts. To avoid any ugly effect on your users, we recommend you first establish a checklist
@@ -425,9 +425,9 @@ The complete process is as follow:
     <em>old_version</em> and make it writeable by the web server. This
 is important to allow the move of the courses/ and upload/ directories
 to the new install</li>
-  <li> download the Chamilo 1.9 install package from the
+  <li> download the Chamilo 1.10 install package from the
     <a href="http://www.chamilo.org/download">Chamilo download page</a></li>
-  <li> unzip the new files of Chamilo 1.9 in the main Chamilo/Dok€os directory. The
+  <li> unzip the new files of Chamilo 1.10 in the main Chamilo/Dok€os directory. The
 new directory <em>main</em> should be located directly inside your
 Chamilo/Dok€os root folder</li>
   <li> point your browser on your portal URL</li>
@@ -477,7 +477,7 @@ On Linux, Mac OS X and BSD operating systems you can quick-fix this using the
 your own OS on <a href="http://www.chamilo.org/forum">our forum</a>.
 In Windows, you may need to check the properties of the folders.
 <p></p>
-<h3>3.6 Quick-upgrade from 1.8.x guide for Linux</h3>
+<h3>3.6 Quick-upgrade from 1.9.x guide for Linux</h3>
 
 
 The following quick-upgrade guide assumes that:
@@ -498,11 +498,11 @@ On the command-line, type:
   <li>mkdir /var/www/chamilo/old_version</li>
   <li>mv /var/www/chamilo/* /var/www/chamilo/old_version/</li>
   <li>chmod -R 0777 /var/www/chamilo/old_version/</li>
-  <li>wget http://chamilo.googlecode.com/files/chamilo-1.9.10.tar.gz</li>
-  <li>tar zxvf chamilo-1.9.10.tar.gz</li>
-  <li>sudo cp -ra chamilo-1.9.10/* /var/www/chamilo/</li>
-  <li>rm chamilo-1.9.10.tar.gz</li>
-  <li>sudo rm -r chamilo-1.9.10/</li>
+  <li>wget https://github.com/chamilo/chamilo-lms/archive/v1.9.10.tar.gz</li>
+  <li>tar zxvf chamilo-lms-1.9.10.tar.gz</li>
+  <li>sudo cp -ra chamilo-lms-1.9.10/* /var/www/chamilo/</li>
+  <li>rm chamilo-lms-1.9.10.tar.gz</li>
+  <li>sudo rm -r chamilo-lms-1.9.10/</li>
 </ul>
 
 <br />