Merge branch '1.9.x' of ssh://github.com/chamilo/chamilo-lms into chamilo19

documentation/credits.html

@@ -683,6 +683,7 @@ Note that we are infinitely grateful to our translators, having made the spread
   <li>Francis Gonzales Tello, for a first draft of the OpenMeetings plugin for 1.9.8</li>
   <li>Maxim Solodovnik, for his help in the development of the OpenMeetings plugin for 1.9.8 - see https://issues.apache.org/jira/browse/OPENMEETINGS-802</li>
   <li>Adolfo Igualada Martínez, for changes to the glossary to PDF export for subdir installs in 1.9.8 (#6929)</li>
+  <li>Kevin Levron, for several contributions to Chamilo LMS 1.9.*</li>
   <li>All the supporting parents, partners, children, friends, colleagues and sometimes students, of the very special geeks that we are, for their continous support and inspiration</li> 
 </ul>
 
@@ -713,6 +714,7 @@ These institutions and companies have either contributed to the Chamilo project
   <li>Universidad de Tocantins, Tocantins, Brazil</li>
   <li>Université de Genève, Geneva, Switzerland</li>
   <li>Université de Grenoble, Grenoble, France</li>
+  <li>Université de Pau, Pau, France</li>
   <li>Unidad Editorial, Spain</li>
   <li>Universidad Autónoma, Chile</li>
   <li>Vall d'Hebron Hospital, Barcelona, Spain</li>

documentation/optimization.html

@@ -173,6 +173,7 @@ If you prefer using <a href="http://php.net/manual/en/book.apc.php">APC</a>, you
         }
      ...
 </pre>
+<p>It is also worth noting that the Université de Genève, Switzerland, observed that the calculation of the total size used by course documents is one of the heaviest queries in Chamilo, so you might want to cache the results of this one as well, using the same technique.</p>
 <hr />
 <h2><a name="2.Slow-queries"></a>2. Slow queries</h2>
 Enable slow_queries in /etc/mysqld/my.cnf, restart MySQL then follow using sudo tail -f /var/log/mysql/mysql-slow.log