summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGravatar Tim Wootton <tim@tee-jay.demon.co.uk>2014-07-29 23:54:47 +0100
committerGravatar Dirk Hohndel <dirk@hohndel.org>2014-07-29 22:47:20 -0700
commitb63886daf30b4f7037cce7c33861b2687264355e (patch)
tree586c808255fd530052a88a7f2d7483a1d6073fa3
parent4fa8706e25ff713335da66ae3326d6d9daaff8c9 (diff)
downloadsubsurface-b63886daf30b4f7037cce7c33861b2687264355e.tar.gz
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 <tim@tee-jay.demon.co.uk> Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
-rw-r--r--Documentation/user-manual.txt4
1 files 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