[PATCH 1/3] Replace most refs to Microsoft with Windows

Tim Wootton tim at tee-jay.demon.co.uk
Tue Jul 29 15:54:47 PDT 2014


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 at tee-jay.demon.co.uk>
---
 Documentation/user-manual.txt | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/Documentation/user-manual.txt b/Documentation/user-manual.txt
index 4465421..0c5ea6e 100644
--- a/Documentation/user-manual.txt
+++ b/Documentation/user-manual.txt
@@ -33,9 +33,9 @@ software solutions:
    interface for downloading dive logs from all these different pieces of
    equipment and to store and analyse the dive logs within a unified system.
  - Do you use more than one operating system? _Subsurface_ is fully compatible
-   with Mac, Linux and Microsoft, allowing you to access your dive log on each
+   with Mac, Linux and Windows, allowing you to access your dive log on each
    of your operating systems in a unified way.
- - Do you use Linux or Mac and your dive computer has only Microsoft-based software
+ - Do you use Linux or Mac and your dive computer has only Windows-based software
    for downloading dive information (e.g. Mares)? _Subsurface_ provides a way of
    storing and analysing your dive logs on other operating systems.
 
@@ -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
-- 
2.0.1



More information about the subsurface mailing list