From b28b974c65b34d13625fadfee71168ba1bd649eb Mon Sep 17 00:00:00 2001 From: Isaac Bennetch Date: Wed, 29 Apr 2015 14:27:29 -0400 Subject: [PATCH 1/2] Add some import-export user documentation Signed-off-by: Isaac Bennetch --- doc/import_export.rst | 27 +++++++++++++++++++++++++++ doc/user.rst | 1 + 2 files changed, 28 insertions(+) create mode 100644 doc/import_export.rst diff --git a/doc/import_export.rst b/doc/import_export.rst new file mode 100644 index 0000000000..5921cd5c12 --- /dev/null +++ b/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. + diff --git a/doc/user.rst b/doc/user.rst index ceaf723322..06a3c9c4c5 100644 --- a/doc/user.rst +++ b/doc/user.rst @@ -7,3 +7,4 @@ User Guide transformations privileges other + import_export From d31ce05b914cdcdf99c0e3c178d13f8d5a4f5efe Mon Sep 17 00:00:00 2001 From: Isaac Bennetch Date: Thu, 30 Apr 2015 00:11:10 -0400 Subject: [PATCH 2/2] Fix typo Signed-off-by: Isaac Bennetch --- doc/config.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/config.rst b/doc/config.rst index 4bcf5a4911..782b1078e3 100644 --- a/doc/config.rst +++ b/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`.