Skip to content

Commit e5b8c56

Browse files
committed
Improvements to import-export documentation
Signed-off-by: Isaac Bennetch <bennetch@gmail.com>
1 parent b44159d commit e5b8c56

1 file changed

Lines changed: 13 additions & 12 deletions

File tree

docs/import_export.rst

Lines changed: 13 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ You can import using any of these methods:
1818

1919
Form based upload
2020

21-
Can be used with any supported format, also (b|g)zipped files, e.g., mydump.sql.gz .
21+
Can be used with any supported format including files compressed with zip, bzip, and gzip, e.g. ``mydump.sql.gz``.
2222

2323
Form based SQL Query
2424

@@ -63,8 +63,8 @@ among Esri and other software products.
6363
MediaWiki
6464
---------
6565

66-
MediaWiki files, which can be exported by phpMyAdmin (version 4.0 or later),
67-
can now also be imported. This is the format used by Wikipedia to display
66+
MediaWiki files, which can be exported by phpMyAdmin
67+
can also be imported. This is the format used by Wikipedia to display
6868
tables.
6969

7070
Open Document Spreadsheet (ODS)
@@ -104,7 +104,7 @@ SQL can be used to make any manipulation on data, it is also useful for restorin
104104
XML
105105
---
106106

107-
XML files exported by phpMyAdmin (version 3.3.0 or later) can now be imported.
107+
XML files exported by phpMyAdmin can be imported.
108108
Structures (databases, tables, views, triggers, etc.) and/or data will be
109109
created depending on the contents of the file.
110110

@@ -114,15 +114,13 @@ Export
114114
++++++
115115

116116
phpMyAdmin can export into text files (even compressed) on your local disk (or
117-
a special the webserver :config:option:`$cfg['SaveDir']` folder) in various
117+
a special :config:option:`$cfg['SaveDir']` folder on the webserver) in various
118118
commonly used formats:
119119

120120
CodeGen
121121
-------
122122

123-
`NHibernate <https://en.wikipedia.org/wiki/NHibernate>`_ file format. Planned
124-
versions: Java, Hibernate, PHP PDO, JSON, etc. So the preliminary name is
125-
codegen.
123+
`NHibernate <https://en.wikipedia.org/wiki/NHibernate>`_ code generation file format.
126124

127125
CSV
128126
---
@@ -133,15 +131,16 @@ other programs for export/import.
133131
CSV for Microsoft Excel
134132
-----------------------
135133

136-
This is just preconfigured version of CSV export which can be imported into
134+
This is just a preconfigured version of CSV export which can be imported into
137135
most English versions of Microsoft Excel. Some localised versions (like
138-
"Danish") are expecting ";" instead of "," as field separator.
136+
"Danish") are expecting ";" instead of "," as the field separator.
139137

140138
Microsoft Word 2000
141139
-------------------
142140

143-
If you're using Microsoft Word 2000 or newer (or compatible such as
144-
OpenOffice.org), you can use this export.
141+
Export format compatible with Microsoft Word 2000 or newer (or any compatible
142+
program that can import Word documents). LibreOffice also supports this format,
143+
but the OpenDocument Text (ODT) format is recommended for best compatibility.
145144

146145
JSON
147146
----
@@ -278,6 +277,8 @@ Open standard for spreadsheet data, which has being widely adopted. Many recent
278277
spreadsheet programs, such as LibreOffice, OpenOffice, Microsoft Office or
279278
Google Docs can handle this format.
280279

280+
.. _ODT:
281+
281282
OpenDocument Text
282283
-----------------
283284

0 commit comments

Comments
 (0)