diff options
author | Miika Turkia <miika.turkia@gmail.com> | 2013-02-17 10:10:12 +0200 |
---|---|---|
committer | Dirk Hohndel <dirk@hohndel.org> | 2013-02-17 11:11:01 -0800 |
commit | 3afd971e4a398f0ee23a8e5510b68c0b67daea98 (patch) | |
tree | 890dc3a2b058acd648b7de2724d4d999447e97a2 /Documentation | |
parent | fa08ef2ee389de2703e0ee0d0633ca3eeeedf806 (diff) | |
download | subsurface-3afd971e4a398f0ee23a8e5510b68c0b67daea98.tar.gz |
Moving common information to Import introduction
Writing an introductory chapter for the divelog import and moving
relevant content to it
Signed-off-by: Miika Turkia <miika.turkia@gmail.com>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
Diffstat (limited to 'Documentation')
-rw-r--r-- | Documentation/user-manual.txt | 23 |
1 files changed, 14 insertions, 9 deletions
diff --git a/Documentation/user-manual.txt b/Documentation/user-manual.txt index dba88c9b2..7fa36f606 100644 --- a/Documentation/user-manual.txt +++ b/Documentation/user-manual.txt @@ -448,6 +448,20 @@ Simply try COM1, COM2, etc. The drop down list should contain all connected COM The drop down box should find all connected divecomputers. +[[S_ImportingAlienDiveLogs]] +Importing divelogs from other software +-------------------------------------- + +Subsurface will import divelogs from a couple of other log software. We +support currently XML exports from DivingLog as well as Suunto +DiveManager. Native format of JDivelog and MacDive are imported as well. + +When importing dives subsurface tries to detect multiple records for +the same dive and merges the information as best as it can. So as long +as there are no time zone issues (or other reasons that would cause the +beginning time of the dives to be substantially different) subsurface +will not create duplicate entries. + [[S_ImportingDivesJDivelog]] Importing dives from JDivelog ----------------------------- @@ -492,15 +506,6 @@ will open your divelog (assuming that's called MyDives.xml) and then import the dives from JdivelogDives.jlb. You can now save the combined divelog back as MyDives.xml. -Subsurface will similarly import xml exports from DivingLog as well as -Suunto DiveManager. - -When importing dives subsurface tries to detect multiple records for -the same dive and merges the information as best as it can. So as long -as there are no time zone issues (or other reasons that would cause the -beginning time of the dives to be substantially different) subsurface -will not create duplicate entries. - [[S_ImportingDivesSuunto]] Importing dives from Suunto Divemanager 3.* ------------------------------------------- |