diff --git a/ChangeLog b/ChangeLog
index 75c8f1e3c..9f2329143 100755
--- a/ChangeLog
+++ b/ChangeLog
@@ -5,6 +5,10 @@ phpMyAdmin - Changelog
$Id$
$Source$
+2005-07-01 Marc Delisle
+ * Documentation.html: patch #1229673, improvement to big-file-import
+ instructions, thanks to Isaac Bennetch - ibennetch
+
2005-06-30 Marc Delisle
* lang/hungarian update, thanks to Mihály Mészáros
* lang/japanese: updated, thanks to Tadashi Jokagi (elf2000)
diff --git a/Documentation.html b/Documentation.html
index da46dab7e..a9daf967c 100755
--- a/Documentation.html
+++ b/Documentation.html
@@ -1627,6 +1627,8 @@ Defaults to FALSE (drop-down).
Please note that if PHP is running in safe mode, this directory must
be owned by the same user as the owner of the phpMyAdmin scripts.
+ See also FAQ 1.16 for alternatives.
+
$cfg['docSQLDir'] string
@@ -2462,14 +2464,27 @@ To create a new, empty mimetype please see libraries/transformations/template_ge
The first things to check (or ask your host provider to check) are the
values of upload_max_filesize, memory_limit and
post_max_size in the php.ini configuration file.
-
All of these three settings limit the maximum size of data that can be
submitted and handled by PHP. One user also said that post_max_size
and memory_limit need to be larger than upload_max_filesize.
-
- If you get a timeout problem, look at the $cfg['UploadDir']
- feature.
+
+ There exist several workarounds if your upload is too big or your
+ hosting provider is unwilling to change the settings:
+
+ - Look at the $cfg['UploadDir'] feature. This allows one to
+ upload a file to the server via scp, ftp, or your favorite file transfer
+ method. PhpMyAdmin is then able to import the files from the temporary
+ directory. More information is available in the "Configuration"
+ section of this document.
+ - Using a utility (such as
+ BigDump) to split the files before uploading. We cannot support this
+ or any third party applications, but are aware of users having success
+ with it.
+ - If you have shell (command line) access, use MySQL to import the files
+ directly. You can do this by issuing the "source" command from
+ within MySQL: source filename.sql.
+