Merge remote-tracking branch 'origin/3.3' into 3.4

htdocs/conf/.gitignore

@@ -1,3 +1,4 @@
+/conf.php
 /conf.php.old
 /conf.php.sav
 /conf.php.mysql

htdocs/core/boxes/modules_boxes.php

@@ -27,7 +27,7 @@
 /**
  *		Parent class of boxes
  */
-class ModeleBoxes    // Can't be abtract as it is instanciated to build "empty" boxes
+class ModeleBoxes    // Can't be abtract as it is instantiated to build "empty" boxes
 {
 	var $db;
 	var $error='';

htdocs/core/lib/pdf.lib.php

@@ -67,7 +67,7 @@ function pdf_getFormat($outputlangs='')
 }
 
 /**
- *      Return a PDF instance object. We create a FPDI instance that instanciate TCPDF.
+ *      Return a PDF instance object. We create a FPDI instance that instantiate TCPDF.
  *
  *      @param	string		$format         Array(width,height). Keep empty to use default setup.
  *      @param	string		$metric         Unit of format ('mm')