From b63886daf30b4f7037cce7c33861b2687264355e Mon Sep 17 00:00:00 2001 From: Tim Wootton Date: Tue, 29 Jul 2014 23:54:47 +0100 Subject: [PATCH] Replace most refs to Microsoft with Windows Referring to software as "Microsoft software" implies it's written by Microsoft, which I don't think the Mares Dive Organizer is. Microsoft still needs to stay for SQL Compact Edition which is theirs but I think "Windows software" is the better description for the rest. For consistency I think this works for refering to the OS too, as we use Mac, not Apple, and Linux not Canonical. Signed-off-by: Tim Wootton Signed-off-by: Dirk Hohndel --- Documentation/user-manual.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Documentation/user-manual.txt b/Documentation/user-manual.txt index 27f15ede8..a26f8b508 100644 --- a/Documentation/user-manual.txt +++ b/Documentation/user-manual.txt @@ -897,7 +897,7 @@ accessible through the Import dialogue are also supported, as explained below. ==== Importing from Mares Dive Organiser V2.1 -Since Mares utilise proprietary Microsoft software not compatible with +Since Mares utilise proprietary Windows software not compatible with multi-platform applications, these dive logs cannot be directly imported into _Subsurface_. Mares dive logs need to be imported using a three-step process, @@ -2778,7 +2778,7 @@ Backing up Suunto DM4: [icon="images/icons/mareslogo.jpg"] [NOTE] -Mares Dive Organiser is a Microsoft application. The dive log is kept as a +Mares Dive Organiser is a Windows application. The dive log is kept as a Microsoft SQL Compact Edition data base with a '.sdf' filename extension. The data base includes all Dive Organiser-registered divers on the particular computer and all Mares dive computers used. The safest way to obtain a copy