Merge branch 'master' of github.com:chamilo/chamilo-lms

documentation/dependencies.html

@@ -57,18 +57,21 @@ required information to install it.</p>
 <a name="dependencies"></a>
 <h2>Dependencies - client-side</h2>
 <ul>
-  <li>Any modern browser (IE6 *excluded*). Safari is known to have small issues with the WYSIWYG editor.</li>
+  <li>Any modern browser (IE6 *excluded*). Safari is known to have minor issues with the WYSIWYG editor.</li>
   <li>Optional: Flash plugin (only required for a few features)</li>
 </ul>
 <h2>Dependencies - server-side</h2>
 <ul>
   <li> Apache 2+</li>
-  <li> PHP 5.3 or 5.4 with MySQL bindings and php-gd extension to allow Chamilo to resize pictures. The 
+  <li> PHP 5.3 or 5.4 with MySQL bindings (mysqlnd is recommended) and php-gd extension to allow Chamilo to resize pictures. The 
-  new components we have included from the Symfony framework highly depend on namespaces, a feature that appeared in PHP 5.3.0+</li>
+  new components we have included from the Symfony framework highly depend on namespaces, a feature that appeared in PHP 5.3.0</li>
   <li> MySQL 5.1+ or any version of MariaDB database server</li>
   <li>php5-intl</li>
+  <li>php5-imagick</li>
   <li>php5-curl (only required for a feature in the links tool)</li>
   <li>php5-mcrypt (only required for a feature in the survey tool)</li>
+  <li>php5-ldap (only required for connection to a LDAP server)</li>
+  <li>php5-xapian (only required for full-text indexing and search)</li>
 </ul><br />
 <a name="included_dependencies"></a>
 <h2>Included Dependencies</h2>

documentation/installation_guide.html

@@ -128,7 +128,7 @@ On the RewriteBase line, where it normally says "/", change it to whatever subdi
 </p>
 <h3>Downloading and installing Chamilo</h3>
 <ol>
-  <li><a href="http://www.chamilo.org/download">Download Chamilo LMS</a></li>
+  <li><a href="http://www.chamilo.org/en/download">Download Chamilo LMS</a></li>
   <li>Unzip it</li>
   <li>Copy the Chamilo directory in your Apache web directory. This can be
     <span style="font-weight: bold;">C:\xampp\htdocs\</span> on a Windows server or <span style="font-weight: bold;">/var/www/html/</span> (or /var/www/chamilo/) on a Linux server</li>