diff --git a/htdocs/conf/.gitignore b/htdocs/conf/.gitignore
index da65ac7c6c9..ed21fdfaa4c 100644
--- a/htdocs/conf/.gitignore
+++ b/htdocs/conf/.gitignore
@@ -1,3 +1,4 @@
+/conf.php
 /conf.php.old
 /conf.php.sav
 /conf.php.mysql
diff --git a/htdocs/core/boxes/modules_boxes.php b/htdocs/core/boxes/modules_boxes.php
index 140b5c757f9..aa41cb27455 100644
--- a/htdocs/core/boxes/modules_boxes.php
+++ b/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='';
diff --git a/htdocs/core/lib/pdf.lib.php b/htdocs/core/lib/pdf.lib.php
index 1b11880d904..e31a67a9566 100644
--- a/htdocs/core/lib/pdf.lib.php
+++ b/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')