On Tue, Dec 16, 2014 at 03:45:22PM +0200, Willem Ferguson wrote: > Update of user manual to give much more information about CSV dive log > import > > This patch addresses several issues: > 1) At the beginning of the manual a section was rewritten, just after > "How to open a new log book", to explain to the newby what the > different options are for entering dive data into the Subsurface > dive log. > 2) A new section "A diver's introduction to CSV files" was written as > a boxed section. > 3) The section dealing with CSV import from dive computers was > shortened because much of the information was transferred to > the new section in point 2) above. > 4) The section dealing with CSV import from manually kept dive > logs was expanded, specifically giving more information > about import from manually kept dive logs in spreadsheets. > 5) Appendix D was added, detailing CSV export from LibreOffice, > OpenOffice and Microsoft Excel. > > Signed-off-by: willem ferguson <[email protected]> > > Signed-off-by Pedro Neves <[email protected]> > > Dirk, is it possible to sign it off against Pedro, please? He did a large > part > of this.
His patch went in a while ago, and he got credit (and the code had his SOB). But your patch wasn't against master but against an older version of the manual. I ended up creating a separate branch, applying it against that and then doing a manual merge. Take a look and see if the result is what you wanted, otherwise please send patches relative to that. /D _______________________________________________ subsurface mailing list [email protected] http://lists.subsurface-divelog.org/cgi-bin/mailman/listinfo/subsurface
