Merge branch 'QA_4_4' of github.com:phpmyadmin/phpmyadmin into QA_4_4

doc/config.rst

@@ -1403,7 +1403,7 @@ Cookie authentication options
     :type: string
     :default: ``''``
 
-    The public key for the reCaptcha service that can be obtain from
+    The public key for the reCaptcha service that can be obtained from
     http://www.google.com/recaptcha.
 
     reCaptcha will be then used in :ref:`cookie`.

doc/import_export.rst

@@ -0,0 +1,27 @@
+Import and export
+=================
+
+In addition to the standard Import and Export tab, you can also import an SQL file directly by dragging and dropping
+it from your local file manager to the phpMyAdmin interface in your web browser.
+
+Open Document Spreadsheet
+-------------------------
+
+When importing an ODS speadsheet, the spreadsheet must be named in a specific way in order to make the
+import as simple as possible.
+
+Table name
+~~~~~~~~~~
+
+During import, phpMyAdmin uses the sheet name as the table name; you should rename the
+sheet in your spreadsheet program in order to match your existing table name (or the table you wish to create,
+though this is less of a concern since you could quickly rename the new table from the Operations tab).
+
+Column names
+~~~~~~~~~~~~
+
+You should also make the first row of your spreadsheet a header with the names of the columns (this can be
+accomplished by inserting a new row at the top of your spreadsheet). When on the Import screen, select the
+checkbox for "The first line of the file contains the table column names;" this way your newly imported
+data will go to the proper columns.
+

doc/user.rst

@@ -7,3 +7,4 @@ User Guide
     transformations
     privileges
     other
+    import_export