Merge remote-tracking branch 'origin/master'

phpmyadmin · Apr 27, 2016 · 9fe4fc6 · 9fe4fc6
2 parents 994b158 + af9ae1d
commit 9fe4fc6
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/doc/faq.rst b/doc/faq.rst
@@ -115,8 +115,8 @@ It seems to clear up many problems between Internet Explorer and SSL.
 
 .. _faq1_11:
 
-1.11 I get an 'open\_basedir restriction' while uploading a file from the query box.
-------------------------------------------------------------------------------------
+1.11 I get an 'open\_basedir restriction' while uploading a file from the import tab.
+-------------------------------------------------------------------------------------
 
 Since version 2.2.4, phpMyAdmin supports servers with open\_basedir
 restrictions. However you need to create temporary directory and configure it