Merge branch '1.11.x' of github.com:chamilo/chamilo-lms into 1.11.0-releases

Author: ywarnier

documentation/credits.html

@@ -60,7 +60,7 @@ <h2>Table of contents</h2>
 <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>
+<h2>Chamilo LMS 1.11.*</h2>
 <ul>
   <li>Yannick Warnier ([email protected]) - Technical coordinator, Project Leader - BeezNest, Belgium/Peru</li>
   <li>Julio Montoya ([email protected]) - Lead developer - BeezNest, France</li>

documentation/dependencies.html

@@ -64,16 +64,17 @@ <h2>Dependencies - client-side</h2>
   <li>We recommend a Pentium-I as a minimum processor capability for PCs</li>
   <li>Works on Windows XP (SP3 recommended) and later versions, Linux (any version with a graphical interface), Mac OS (any version), FreeBSD, Android, iOS and pretty much any other operating system with a graphical interface you might think about</li>
   <li>Any modern browser (IE8 and inferior *excluded*).</li>
-  <li>Optional: Flash plugin (only required for a few features like the hotspot image question type and the audio recorder)</li>
-  <li>Optional: Java applet capability (only required in case you don't use the Flash version of the audio recorder)</li>
+  <li>Optional: Flash plugin (only required for a few features like the videoconference plugins)</li>
+  <li>Optional: Java applet capability (only required for some plugins)</li>
 </ul>
 
 <h2>Dependencies - server-side</h2>
 <ul>
   <li>Apache 2+</li>
-  <li> PHP 5.4 or higher with MySQL bindings (mysqlnd is recommended) and php-gd extension to allow Chamilo to resize pictures. Not tested with PHP 7.0 yet</li>
+  <li> PHP 5.4 or higher with MySQL bindings (mysqlnd is recommended) and php-gd extension to allow Chamilo to resize pictures. Now also supports PHP 7.0</li>
   <li>MySQL 5.1+ or any version of MariaDB database server</li>
   <li>php5-intl package (for international behaviour support)</li>
+  <li>php5-mbstring package (for international behaviour support)</li>
   <li>php5-imagick</li>
   <li>php5-curl (only required for a feature in the links tool and an optional installer check)</li>
   <li>php5-mcrypt (only required for a feature in the survey tool)</li>

documentation/index.html

@@ -35,12 +35,12 @@
 <div class="container">
     <div class="row">
         <div class="hero-unit">
-            <h1>Chamilo 1.10 - Documentation</h1>
+            <h1>Chamilo 1.11 - Documentation</h1>
             <br />
 
             <a class="btn btn-primary btn-large" href="installation_guide.html">English installation guide</a>
-            <a class="btn btn-primary btn-large"  href="installation_guide_es_ES.html">Spanish installation guide (outdated)</a>
-            <a class="btn btn-primary btn-large" href="installation_guide_fr_FR.html">French installation guide (outdated)</a>
+            <a class="btn btn-primary btn-large"  href="installation_guide_es_ES.html">Spanish installation guide (slightly outdated)</a>
+            <a class="btn btn-primary btn-large" href="installation_guide_fr_FR.html">French installation guide (slightly outdated)</a>
             <a class="btn btn-primary btn-large"  href="installation_guide_it_IT.html">Italian installation guide (outdated)</a>
             <a class="btn btn-large"  href="http://www.chamilo.org/forum">Chamilo Forum</a>
             <br />