Subsurface-mobile user manual V2.1.5

Updates to the user manual for Subsurface-mobile. Many new
figures have been brought in. The text has been overhauled
to include latest features and some features that do not
exist any more have been removed. Text has been added,
explaining the copy-and-paste operation (Thanks, Miika).

Signed-off-by: willemferguson <willemferguson@zoology.up.ac.za>

16 files changed, 197 insertions, 167 deletions

diff --git a/Documentation/mobile-images/CopyDeleteDive.jpg b/Documentation/mobile-images/CopyDeleteDive.jpg
new file mode 100644
index 000000000..2c1b94c3c
--- /dev/null
+++ b/Documentation/mobile-images/CopyDeleteDive.jpg
diff --git a/Documentation/mobile-images/DC-Download.jpg b/Documentation/mobile-images/DC-Download.jpg
index e3dd3c4ed..51cad6888 100644
--- a/Documentation/mobile-images/DC-Download.jpg
+++ b/Documentation/mobile-images/DC-Download.jpg
diff --git a/Documentation/mobile-images/Divelist2.jpg b/Documentation/mobile-images/Divelist2.jpg
index c0a166343..9e165d734 100644
--- a/Documentation/mobile-images/Divelist2.jpg
+++ b/Documentation/mobile-images/Divelist2.jpg
diff --git a/Documentation/mobile-images/DivesMap.jpg b/Documentation/mobile-images/DivesMap.jpg
new file mode 100644
index 000000000..9f9d8fcf4
--- /dev/null
+++ b/Documentation/mobile-images/DivesMap.jpg
diff --git a/Documentation/mobile-images/Editdive.jpg b/Documentation/mobile-images/Editdive.jpg
index 078a465fa..74b1d4012 100644
--- a/Documentation/mobile-images/Editdive.jpg
+++ b/Documentation/mobile-images/Editdive.jpg
diff --git a/Documentation/mobile-images/Filter.jpg b/Documentation/mobile-images/Filter.jpg
new file mode 100644
index 000000000..5edcac27e
--- /dev/null
+++ b/Documentation/mobile-images/Filter.jpg
diff --git a/Documentation/mobile-images/FilterButton.jpg b/Documentation/mobile-images/FilterButton.jpg
new file mode 100644
index 000000000..70ea0a16d
--- /dev/null
+++ b/Documentation/mobile-images/FilterButton.jpg
diff --git a/Documentation/mobile-images/GPSstart.jpg b/Documentation/mobile-images/GPSstart.jpg
index b3c56117e..01a85baa9 100644
--- a/Documentation/mobile-images/GPSstart.jpg
+++ b/Documentation/mobile-images/GPSstart.jpg
diff --git a/Documentation/mobile-images/Map.jpg b/Documentation/mobile-images/Map.jpg
index 98b005b17..582ed802f 100644
--- a/Documentation/mobile-images/Map.jpg
+++ b/Documentation/mobile-images/Map.jpg
diff --git a/Documentation/mobile-images/Menusystem.jpg b/Documentation/mobile-images/Menusystem.jpg
index f73472f80..6389a29d4 100644
--- a/Documentation/mobile-images/Menusystem.jpg
+++ b/Documentation/mobile-images/Menusystem.jpg
diff --git a/Documentation/mobile-images/PinkTheme.jpg b/Documentation/mobile-images/PinkTheme.jpg
new file mode 100644
index 000000000..74ea7722c
--- /dev/null
+++ b/Documentation/mobile-images/PinkTheme.jpg
diff --git a/Documentation/mobile-images/RedDustbin.jpg b/Documentation/mobile-images/RedDustbin.jpg
deleted file mode 100644
index 6d1d2dba4..000000000
--- a/Documentation/mobile-images/RedDustbin.jpg
+++ /dev/null
diff --git a/Documentation/mobile-images/SettingsCloudTheme.jpg b/Documentation/mobile-images/SettingsCloudTheme.jpg
index 5e00a6441..6c95547ae 100644
--- a/Documentation/mobile-images/SettingsCloudTheme.jpg
+++ b/Documentation/mobile-images/SettingsCloudTheme.jpg
diff --git a/Documentation/mobile-images/USB-OTG.jpg b/Documentation/mobile-images/USB-OTG.jpg
index 256cc2269..31e6396f9 100644
--- a/Documentation/mobile-images/USB-OTG.jpg
+++ b/Documentation/mobile-images/USB-OTG.jpg
diff --git a/Documentation/mobile-images/gpsmanagement.jpg b/Documentation/mobile-images/gpsmanagement.jpg
index 6de2d60ec..600eca39b 100644
--- a/Documentation/mobile-images/gpsmanagement.jpg
+++ b/Documentation/mobile-images/gpsmanagement.jpg
diff --git a/Documentation/mobile-manual.txt b/Documentation/mobile-manual.txt
index a05b34f81..5b48cf920 100644
--- a/Documentation/mobile-manual.txt
+++ b/Documentation/mobile-manual.txt
@@ -2,8 +2,8 @@
 // Subsurface-mobile User Manual
 // =============================
 // :author: Manual authors: Willem Ferguson, Dirk Hohndel
-// :revnumber: 2.0.2
-// :revdate: December 2017
+// :revnumber: 2.1.5
+// :revdate: December 2018
 :icons:
 :toc:
 :toc-placement: manual
@@ -18,7 +18,7 @@ image::mobile-images/Banner.jpg["Banner",align="center"]
 
 // toc::[]
 
-[blue]#_Version 2, December 2017_#
+[blue]#_Version 2.1.5, December 2018_#
 
 Welcome as a user of _Subsurface_ and _Subsurface-mobile_, advanced dive logging
 software with extensive infrastructure to describe, organize, and interpret scuba
@@ -31,8 +31,8 @@ information from many dive computers.
 Introducing Subsurface-mobile
 -----------------------------
 
-_Subsurface-mobile_ is a more limited mobile version of _Subsurface_
-aimed at Android and iOS smartphone and tablet devices, allowing viewing, entering, sharing, and storage of dive information at dive sites where a larger
+_Subsurface-mobile_ is a limited mobile version of _Subsurface_
+aimed at Android and iOS smartphone and tablet devices, allowing viewing, entering, sharing, and storage of dive information at dive sites where a desktop
 computer is not useful. While the desktop version of _Subsurface_ shows much more detailed information
 for each dive, the mobile version allows a more accessible dive log
 on a dive trip, useful for proving dive experience to dive shops or to review
@@ -51,7 +51,7 @@ _Subsurface-mobile_ allows:
 - Viewing this information on a mobile device.
 - Manually creating and adding new dive records to your dive log.
 - Download dive data directly from many dive computers.
-- Editing many of the dive log data fields, e.g. divemaster, buddy,
+- Editing many of the dive log data fields, e.g. dive-master, buddy,
   equipment or notes relating to a dive.
 - Recording, storing and applying GPS positions of dives.
 - Viewing the localities of recorded GPS positions and of dives
@@ -60,7 +60,7 @@ _Subsurface-mobile_ allows:
 These items are discussed in greater detail in the following text.
 _Subsurface-mobile_ does not support download of dive data from all the
 dive computers that the desktop/laptop version can. This limitation is
-mainly caused by the ability to access different type of devices on the
+mainly caused by the inability of accessing some types of devices on the
 two mobile platforms. On Android, a subset of
 dive computers that use a FTDI USB interface or a Bluetooth / Bluetooth LE interface
 are accessible by _Subsurface-mobile_. On iOS, only Bluetooth LE based
@@ -88,26 +88,26 @@ stored on the mobile device only. If no dives have been entered into the dive lo
 yet (the usual case), an empty dive log is created.
 
 === Using Cloud Storage
-The _Subsurface_ developers provide a custom
+The _Subsurface_ developers provide a dedicated and
 free Internet cloud storage account that can be used for
-storing dive log information. This cloud storage account can be created either from _Subsurface_ on the desktop or _Subsurface-mobile_
+storing dive log information. This account can be created either from _Subsurface_ on the desktop or from _Subsurface-mobile_
 using a mobile device; you can
 do full maintenance of a dive log from _Subsurface-mobile_ alone. By using the same
-credentials wirh _Subsurface-mobile_ and _Subsurface_ for desktop, the _Subsurface_ cloud storage allows you to share your dive
+credentials with _Subsurface-mobile_ and _Subsurface_ for desktop, the _Subsurface_ cloud storage allows sharing of a dive
 log between both (or even more than two) devices.
 
-The dive data are cached both on the mobile device as well as on the desktop - it is easy to create backups of the data (for example in XML format) on the desktop, and both mobile device and desktop keep a local copy of the data so that the dive log is always accessible, even without Internet connection. The Subsurface team never accesses a user's dive data without explicit permission to do so, the data are not used for any purpose other than providing them to the user who created them. There are no ads and no harvesting / analysis of the data stored in the Subsurface cloud storage.
+The dive data on the cloud are cached locally both on the mobile device as well as on the desktop - it is easy to create backups of the data (for example in XML format) on the desktop: both mobile device and desktop keep a local copy of the data so that the dive log is always accessible, even without Internet connection. The Subsurface team never accesses a user's dive data without explicit permission to do so, the data are not used for any purpose other than providing them to the user who created them. There are no ads and no harvesting / analysis of the data stored in the Subsurface cloud storage.
 
-1) Enter an e-mail address and a password in the fields indicated on the screen.
+1) Enter an e-mail address and a password in the fields indicated on the screen (see image above).
 The e-mail address should be in lower case and the password should contain a combination of
 letters from the alphabet (upper and lower case) and/or numbers.
 Tap the "Sign-in or Register" button. If you have already set
 up an account from the _Subsurface_ desktop application, enter the same credentials here.
 Once the dive
 list has been downloaded from the cloud, _Subsurface-mobile_ usually works only with the the local
-copy on the mobile device. This avoids long delays or even failure of operations if there is a bad (or no) internet connection, a situation fairly common at many dive sites.
+copy on the mobile device. This avoids long delays or even failure of operations if there is a bad (or no) internet connection, a situation fairly common at many dive sites. Once registered, _Subsurface-mobile_ remembers the cloud credentials and it is not necessary to provide these again when launching the program.
 
-3) If this is a new account, a PIN screen will open (see image on right, above). A PIN is e-mailed
+2) If this is a new cloud account, a PIN screen will open (see image on right, above). A PIN is e-mailed
 to the email address entered in the previous step. Enter this PIN into the field indicated
 and tap the _Register_ button. The user
 information is stored on the cloud server and access to the cloud is enabled. In this case
@@ -121,24 +121,24 @@ the server are synchronized.
 
 === Changing the existing login credentials on the _Subsurface_ cloud
 
-The login credentials can be changed, for an example in order to work with
+The login credentials can be changed, for example to work with
 multiple accounts. See the section on xref:S_ChangeCloudAccount[Changing to a different _Subsurface_ cloud account].
 
 == Menu Structure and User Interface
 
-At the bottom of many Subsurface-mobile screens is a round button that provides for
+At the bottom of many _Subsurface-mobile_ screens is a round button that provides for
 several actions (see image below). The most common choice is indicated in a round colored _action button_ (in the case below, edit a dive). Alternative actions are indicated in a white _action bar_.
 On Android devices, use the Android Back
 button for "cancel", "discard" or "back" actions. For example, when
 editing dive information, tapping the action button saves the changes while the
 Android back button can be used to cancel the edit without saving changes.
 
+image::mobile-images/Actionbutton.jpg["FIGURE: Action Button",align="center"]
+
 On iOS devices, on screens where a "back" action is enabled, a back arrow
 is shown in the top left corner of the screen.
 
-image::mobile-images/Actionbutton.jpg["FIGURE: Action Button",align="center"]
-
-In order to have a consistent experience between iOS and Android,
+For a consistent experience between iOS and Android,
 _Subsurface-mobile_ on Android does not use the traditional "hamburger"
 menu button in the top left or right corner of the screen to open menus.
 Instead, _Subsurface-mobile_ uses a
@@ -148,30 +148,26 @@ developed by the Plasma developers. There are three ways to open the main menu:
 - Tap the "hamburger" symbol in the lower left corner of the screen
   (easy to reach for hand held devices)
 - Swipe towards the right across the left edge of the screen
-- Drag the action button visible on most screens to
-  the right
 
 image::mobile-images/Menusystem.jpg["FIGURE: Dive management sub-panel",align="center"]
 
 The image above indicates some of the important features of the menu system.
 On the left is the main menu, activated as described above. On the right of the image
-are the items of all the submenus accessible.
+are the items of all the sub-menus accessible.
 
 All screenshots in this user manual are currently from the Android
-version. The iOS screens look fairly similar.
+version. The iOS screens look similar.
 
 == The Dive List
 
 Most of the actions of _Subsurface-mobile_ center around the dives on the
 dive list. While the dive list is loading from the cloud,
 a message appears at the bottom of the screen, indicating that the cloud is
-being accessed, after which the dive list is shown. Once the list is loaded you can scroll up and down
-through your dive history.
+being accessed, after which the dive list is shown. Once the list is loaded you can scroll up and down through your dive history.
 To upload dives from a dive computer, tap the blue action button. If you wish
 to add a dive manually, tap the + button in the action bar (described below).
-Tapping an existing dive on the list brings up a display of _Details View_ for that dive
-(see image on right below). This includes the dive profile as well as
-additional information and notes.
+Tapping an existing dive on the list brings up a display of the _Details View_ for that dive
+including the dive profile, notes and additional information.
 
 image::mobile-images/Divelist2.jpg["FIGURE: Dive list screen",align="center"]
 
@@ -182,13 +178,53 @@ on the Action Bar) or to view the dive
 location on a map viewer (Google Maps on Android, the Google Maps web site
 on iOS; tap the GPS icon on the Action Bar.).
 
-[[S_Edit_Dive]]
-== Editing dive details
+== Filter the dive list
+
+Use this action button:
+
+image::mobile-images/FilterButton.jpg["FIGURE: Filter button",align="center"] 
+
+at the bottom of the dive list to perform filtering of the dive list (see image above).
+
+[width="100%", frame="None"]
+|=======
+a|image::mobile-images/Filter.jpg["FIGURE: Filter",align="center"] | [[S_Edit_Dive]]
+By default, all the dives in the dive log are shown in the dive list. After several years one's dive log can become quite long and, sometimes, one would like to list only the dives of a particular type, e.g. those at a particular dive site or those with a specific buddy or dive master. Use the Filter to achieve this. The filter mechanism searches through all the information for each dive, looking for one or more key words. Only the dives containing these key words are listed in the dive list. In the xref:S_Settings[_Settings_] screen there two options that affect the way the filter searches for appropriate information. Firstly, one can select _Match filter case sensitive_ which causes the search of key words to be case sensitive. Secondly, one can select _Include notes in full text filtering_. If this option is not selected, the filter does not search through the dive notes for key words. Selecting the _Filter_ action button brings up a text box at the top of the dive list. Type the key words to be searched for. In the image on the left, the dive list has been filtered for the word "Nitrox" and 265 dives were found containing this word as a tag. For each trip in the dive list the number of dives containing "Nitrox" as a tag is shown. To clear the filter, remove the key words from the text box and select the Filter action button to switch off filtering.
+|=======
+
+== Viewing the locations of all dives in the dive list
+
+[width="100%", frame="None"]
+|=======
+a|image::mobile-images/DivesMap.jpg["FIGURE: Map of all dive sites",align="center"] | 
+The locations of all dives in the dive list can be viewed from the _Main Menu_ by selecting the _Map_ option.
+A satellite image of the world is shown. At that scale no dive sites are shown. If one zooms into a particular region
+of the world the dive sites appear, indicated by red flags. Zooming in even closer indicates the names of each
+of the different dive sites.
+|=======
+
+== Viewing the location of a dive on _Google Maps_
+
+[width="100%", frame="None"]
+|=======
+a|image::mobile-images/Map.jpg["FIGURE: Map of dive site",align="center"] | 
+In the _Details View_, the Action Bar at the bottom has a GPS pin on the
+left hand side. Tap that pin and the dive site is shown in Google Maps. Close Google Maps by using the Android _Back_ button
+or tapping on the _Subsurface-mobile_ link in the top left corner on iOS.
+
+Alternatively, the _Details View_ has a button at the top right hand marked
+_Map it_. Tap this button to open Google Maps showing the dive site (image on left).
+|=======
+
+== Edit a particular dive
 
-At the bottom of the dive details screen the action button is a pencil (image on right, above).
+[width="100%", frame="None"]
+|=======
+a|image::mobile-images/Editdive.jpg["FIGURE: Dive edit screen",align="center"] | 
+At the bottom of the _Dive Details_ screen the action button is a pencil.
 Tapping the pencil button changes the page and enables edit boxes that allow
 modifying the existing dive information, e.g. adding text to the dive notes
-or changing the names or values of some of the information (see image below).
+or changing the names or values of some of the information (see image on left).
 It may be necessary to scroll the window to access all the information.
 At the bottom of the edit screen is a _Save_ action button. Tap this to save
 the new information, after which the dive list screen is
@@ -197,119 +233,137 @@ the application back button at the top left of the screen on iOS.
 
 When the virtual keyboard is shown, to avoid screen clutter, the action button is hidden.
 Once you close the keyboard it is drawn again.
+|=======
 
-image::mobile-images/Editdive.jpg["FIGURE: Dive edit screen",align="center"]
 
 [[S_Add_Dive]]
 == Manually adding a new dive to the dive list
 
 One can manually add a dive to the existing dive list. On the dive list
 tap the "plus" sign in the action bar, or use the
-main menu and tap _Manage dives  ->  Add dive manually_. This opens  a screen that is
+main menu and tap _Dive management  ->  Add dive manually_. This opens  a screen that is
 identical to the editing screen discussed above. When a dive is added manually, you
 cannot directly add a dive profile from a dive computer. However, if you do not use a
 dive computer, the duration, depth and several other bits of information about
 the new dive can be entered. The _Action button_ at the bottom of the screen
-contains a disk symbol. Tap this to save the new dive. To cancel any edits, tap the Android Back Button.
+contains a disk symbol. Tap this to save the new dive. To cancel any edits, tap the _Back_ button.
 The left-hand image below shows a screenshot of a dive being created and the right-hand image shows
 the same dive in _Details View_.
 
 image::mobile-images/Manualdive.jpg["FIGURE: Manual dive entry screen",align="center"]
 
-== Deleting a dive
+== Copy dive information from one dive to another
 
-The _Details View_ of a dive has an Action Bar, including a dustbin. If this is tapped,
-the dive shown in the _Details View_ is deleted. You have a brief opportunity to undo
-the delete by tapping the grey _Undo_ button in the message that appears at the bottom of
-the screen (see image below).
+When editing dives it is possible to transfer information from one dive to another. For instance,
+when diving with the same buddy and the same equipment configuration during a particular dive trip
+it can be efficient to simply copy all this information from the previous dive into the dive that
+is being edited. Currently a standard list of dive information is copied to the clipboard:
 
-image::mobile-images/Delete_undo.jpg["FIGURE: Undo delete dive",align="center"]
+Divemaster, Buddy, Suit, Tags, Cylinders, Weights.
 
-You can also delete a dive from the dive list by long-pressing a dive
-until a red dustbin appears on the right-hand side (see image below). Tap the dustbin. The dive is
-deleted without asking any confirmation because _Subsurface-mobile_ assumes that the
-combination of a long tap on the dive with another tap on the red dustbin is an unambiguous
-instruction to delete the dive.
+Copy and paste dive information is performed on the Dive List. Long-press on a dive. A panel
+with three icons appears on top the selected dive :
 
-image::mobile-images/RedDustbin.jpg["FIGURE: delete dive from list",align="center"]
+image::mobile-images/CopyDeleteDive.jpg["FIGURE: Copy/Delete dive information",align="center"]
 
-== Copying dive details
+To copy the above information to the clipboard, select the leftmost of the three icons. A "Copy"
+notification briefly appears on the screen. Now long-press the dive into which the copied information
+needs to be pasted. The same three icons appear on the target dive. Select the middle icon. A "Paste"
+notification briefly appears on the screen. This completes the copy-and-paste action. Continue by
+reviewing this new (pasted) information by manually editing the target dive.
 
-To copy selected dive details over to another dive, long-press a dive in the
-divelist. This will show a three icons on the right side of the selected dive
-as shown on the image below. The left image will copy details from the selected
-dive and middle button will paste what has been copied before. Naturally you
-should long-press a different dive after copying the details to perform the
-paste operation.
+== Deleting a dive
 
-image::mobile-images/CopyPaste.jpg["FIGURE: copy dive details in list",align="center"]
+Delete a dive from the dive list by long-pressing a dive
+until a red dustbin appears on the right-hand side (see image above). Tap the dustbin.
+The dive is deleted without asking any confirmation because _Subsurface-mobile_ assumes that the
+combination of a long tap on the dive with another tap on the red dustbin is an unambiguous
+instruction to delete the dive.
 
-Currently the details to be copied are hard-coded and include the following
-information:
+A dive can also be deleted from the Details View which has an Action Bar with a dustbin. If this is tapped,
+the dive shown in the _Details View_ is deleted. You have a brief opportunity to undo
+the delete by tapping the grey _Undo_ button in the message that appears at the bottom of
+the screen (see image below).
 
-- divemaster
-- buddy
-- suit
-- tags
-- cylinders
-- weights
+image::mobile-images/Delete_undo.jpg["FIGURE: Undo delete dive",align="center"]
 
 [[S_Download]]
 == Download dives from a dive computer
 
-The download deature supports only a limited number of dive computers. On
+From the main menu,
+tap _Manage dives ->  Download from DC_. A screen is shown requiring that the user specify
+the names of the vendor and model of the dive computer. For instance, when using a Shearwater Petrel dive
+computer, the vendor is _Shearwater_ and the Dive computer name is _Petrel_(see image on the left, below).
+*Caveats:* The download feature in smartphones supports only a limited number of dive computers. On
 Android devices these are typically dive computers using an FTDI interface
 using a USB OTG cable (but this is blocked on some Android devices by OS
-settings). Android devices also support all Bluetooth dive computers that
-are supported in Subsurface. And both Android and iOS devices allow direct
-download of dive data from a hand full of Bluetooth LE enabled dive
-computers.
-
-Use the _Vendor name_ and _Dive Computer_ drop-downs to pick the correct
+settings). Android devices also support Bluetooth dive computers that
+are supported in _Subsurface_ on the desktop. Both Android and iOS devices allow direct
+download of dive data from a handful of Bluetooth LE enabled dive
+computers. Use the _Vendor name_ and _Dive Computer_ drop-downs to pick the correct
 dive computer. When downloading from multiple different dive computers, shortcut
-buttons to easily switch between them will appear below the drop-downs.
-
-The process for download is slightly different between the two OSs.
+buttons appear below the drop-downs to easily switch between them. In the xref:S_Settings[_Settings_] menu
+one can remove these buttons, a useful feature for removing buttons of dive
+computers that are not used any more. Achieve this by selecting the option 
+_Forget remembered dive computers_ in the xref:S_Settings[_Settings_] menu.
+After all these caveats, let us proceed with download. 
+
+*For USB FTDI dive computers:* USB cables "normally" used
+for uploading dives to a desktop/laptop computer do NOT work: these
+cables usually have a full-sized ("Type A") male USB plug
+on one end which plugs into the USB port of a desktop/laptop computer. For downloads to a mobile device
+one needs a USB OTG (USB On-The-Go) cable.
+
+[width="100%", frame="None"]
+|=======
+a|image::mobile-images/USB-OTG.jpg["FIGURE: USB-OTG cable",align="center"] | 
+In most cases it is required to plug the USB
+cable "normally" used with the dive computer into a USB OTG cable which,
+in turn, plugs into the mini-USB (or sometimes a USB "Type C")
+receptacle of the mobile device. The
+OTG cable usually has a full-size ("Type A") female receptacle at one end which
+accommodates the full-sized male plug
+of the USB cable "normally" used (see image below). This means that two cables are used to connect
+the dive computer to the mobile device. *Not all Android devices support OTG cables*
+and even on some devices that do support those cables in general, _Subsurface-mobile_ can in
+some cases still not access a dive computer through a serial port due to
+limitations in the Android and iOS operating systems.
+|=======
+
+_Subsurface_ remembers the settings for dive computers that
+have been successfully used (image on right, below). These appear
+as buttons under a heading "_Previously used dive computers_".
+Select the appropriate button. Having connected the USB dive computer to the
+_Subsurface_ computer and having selected the appropriate vendor and dive computer,
+ensure that the Connection text box shows "FTDI". 
+
+*For BLUETOOTH/BTLE dive computers:* The process for Bluetooth download is slightly different between Android and iOS.
 In our testing we got the best results on iOS when the dive computer was
 in Bluetooth mode before _Subsurface-mobile_ is started. On most dive
 computers this is done through a menu entry, others (like the Suunto
-models) always respond to BLE requests.
-
-On Android devices, you should first establish a link between the
+models) always respond to BTLE requests. However, on Android devices,
+you should first establish a link between the
 Bluetooth or Bluetooth LE dive computer and the mobile device using
 Android utilities. See below for more details.
 
-For USB dive computers, USB cables "normally" used
-for uploading dives to a desktop/laptop computer do NOT work: these cables usually have a full-sized ("Type A") male USB plug
-on one end which plugs into the USB port of a desktop/laptop computer. For downloads to a mobile device
-one needs a USB OTG (USB On-The-Go) cable. In most cases it is required to plug the USB
-cable "normally" used with the dive computer into a USB OTG cable which, in turn, plugs into the mini-USB (or sometimes a USB "Type C")
-receptacle of the mobile device. The
-OTG cable usually has a full-size ("Type A") female receptacle at one end which accommodates the full-sized male plug
-of the USB cable "normally" used (see image below). This means that two cables are used to connect the dive computer to the mobile device.
-
-Please note that not all Android devices support OTG cables. And even on some devices that do support those cables in general, _Subsurface-mobile_ still in some cases cannot access a dive computer through a serial port.
-
-image::mobile-images/USB-OTG.jpg["FIGURE: USB-OTG cable",align="center"]
-
 For Bluetooth-equipped dive computers and Android devices, establish a Bluetooth connection between the dive computer and the
 mobile device. Use the tools on the mobile device to achieve pairing between the Bluetooth dice computer
-and the mobile device. For of Android devices,
-the Settings -> Bluetooth tool is probably appropriate. Ensure pairing of the dive computer and mobile device.
+and the mobile device. For many Android devices,
+the Settings -> Bluetooth tool of Android is probably appropriate.
 _Subsurface-mobile_ performs communication using both Bluetooth and Bluetooth-low-energy (BTLE).
-The appropriate choice of Bluetooth communication is made by the software and the user need not be concerned with this.
-
-With pairing between dive computer and _Subsurface-mobile_ having been set up, dive download is simple.
-From the main menu, tap _Manage dives ->  Download from DC_. A screen is shown requiring that the user specify
-the names of the vendor and model of the dive computer. For instance, when using a Shearwater Petrel 2 dive
-computer, the vendor is _Shearwater_ and the Dive computer name is _Petrel 2_. From the two dropdown lists
-at the top of the screen, select the correct vendor and dive computer names (see image on the left, below).
-
-Now tap the button labeled _Download_. The downloaded dives appear in the bottom part of the screen, the
-most recent dive at the top (see image on right, below). Be patient because the download can take a few minutes.
-As a matter of fact, a complete first download from some dive computers has been shown to take 45 minutes and longer.
-
-After the download, each dive has a check-box on the left hand side, used for selecting which dives you want to be added to the
+The appropriate choice of Bluetooth communication is often made by the software and the user need not be concerned with this.
+For dive computers with both Bluetooth and Bluetooth-low-energy (BTLE), a separate button is presented on the download
+screen for each mode of communication, allowing a choice. Use the _Connection_ value to distinguish between the
+two options. In the image on the right, below, there are three buttons labeled "Shearwater Petrel 2". These represent two Shearwater Petrel dive computers, one of which can communicate in both Bluetooth as well as BTLE. The _Connection_
+information indicates that the Petrel with no BTLE is selected.
+
+*DOWNLOAD:* With communication between dive computer and _Subsurface-mobile_
+having been set up, tap the _Download_ button. Be patient because the download can take a few minutes.
+As a matter of fact, a complete first download from some dive computers can take 45 minutes or longer.
+The downloaded dives appear in the bottom part of the screen,
+the most recent dive at the top (see image on right, below). 
+
+Each dive has a check-box on the left hand side, used for selecting which dives you want to be added to the
 _Subsurface-mobile_ dive list: dives that are not checked are ignored. With the appropriate downloaded dives
 having been checked, tap the button at the bottom left labeled _Accept_. All the selected dives appear on
 the _Subsurface-mobile_ dive list. The downloaded dive information can now be edited as described in the section
@@ -317,26 +371,15 @@ above xref:S_Edit_Dive[Edit a dive].
 
 image::mobile-images/DC-Download.jpg["FIGURE: DC download screen",align="center"]
 
-== Viewing the dive location on Google Maps
-
-In the _Details View_, the Action Bar at the bottom has a GPS pin on the
-left hand side. Tap that pin and the dive site is shown in Google Maps. Close Google Maps by using the Android _Back_ button
-or tapping on the _Subsurface-mobile_ link in the top left corner on iOS.
-
-Alternatively, the _Details View_ has a button at the top right hand marked
-_Map it_. Tap this button to open Google Maps showing the dive site (image below).
-
-image::mobile-images/Map.jpg["FIGURE: Map of dive site",align="center"]
-
 == Dive log management
 
 A central  part of _Subsurface-mobile_ is the ability to store the dive
 log using the _Subsurface_ cloud storage.
-This provides security against loss or damage to the dive information in a local copy
+This provides security against loss or damage of the dive information in a local copy
 and allows the desktop version of _Subsurface_ to
 access changes made using the mobile device. This ability is accessed
-through the main menu (by dragging the Action Button to the right, or
-by tapping the "Hamburger" icon at the bottom left of the screen).
+through the main menu
+(by tapping the "Hamburger" icon at the bottom left of the screen).
 Tap the option _Dive management_, enabling a number of options:
 
 === Add new dive manually
@@ -363,27 +406,31 @@ the dive log using another device or computer and stored in shared cloud storage
 
 By default _Subsurface-mobile_ runs offline and only syncs the dive list
 with cloud storage when explicitly told to do so (see above).
-You can choose to always sync with the cloud servers after every
-modification of the dive list. This is not recommended unless you are in
-an area with fast and reliable internet connection, as otherwise
+You can choose to always sync with the cloud servers. This is not
+recommended unless you are in
+an area with a fast and reliable internet connection, as otherwise
 _Subsurface-mobile_ might appear to hang between operations as it tries to
 connect to the cloud server. Selecting _Enable cloud auto sync_ causes
 the local dive log to be synchronized with the copy in the cloud every time that
-_Subsurface-mobile_ is closed. This option is a switch that allows auto
-sync to be either activated or to be switched off.
+_Subsurface-mobile_ is closed.
 
 == Recording dive locations using GPS
 
 The fact that most smartphones have GPS facilities allows
 _Subsurface-mobile_ to record
-the locations of dives. If the smartphone is taken on the dive boat
+the locations of dives. *IMPORTANT: GPS-derived coordinates on a smartphone
+are not always accurate and can have an error greater than 1 km. GPS accuracy
+is determined by the hardware and software of the
+smartphone as well as by the GPS settings selected within Android/iOS.
+As of Android V6 select Android _Settings -> Communication -> Location -> High accuracy._*
+If the smartphone is taken on the boat
 during a dive, locations will be automatically recorded at regular intervals.
 These locations can then be applied to dives in the dive list. Here is how it's done:
 
 [[S_ConfigureGPS]]
 === Configuring the GPS service
 
-From the Main menu, select _Settings_. The Settings screen has a section for
+From the _Main Menu_, select xref:S_Settings[_Settings_] screen which has a section for
 configuring the GPS service (image below). GPS location data
 are collected at regular intervals, e.g. every 5 minutes, or at regular
 distances, e.g. after the boat has moved more than 200m, or a combination of
@@ -394,45 +441,29 @@ image::mobile-images/GPS-config.jpg["FIGURE: GPS configure",align="center"]
 
 === Collecting GPS positions
 
-Ensure that the GPS on the mobile device has been activated and that you
-have given the app permission to access your location data.
-Open the Main Menu and select _GPS -> Run location service_. This activates the
-recording of GPS locations.
-
-image::mobile-images/GPSstart.jpg["FIGURE: GPS start",align="center"]
-
+[width="100%", frame="None"]
+|=======
+a|image::mobile-images/GPSstart.jpg["FIGURE: GPS start",align="center"] | 
+On the _Main Menu_ select _GPS -> Run location service_.
 _Subsurface-mobile_ starts to collect GPS locations automatically,
 following the preferences specified as described above. While the GPS
 location service is running, all menus have a GPS symbol at the bottom
 of the menu, indicating that the service is active. After return from
 the dive trip, deactivate the collection of GPS data by tapping
-the option _Disable location service_. The GPS symbol at the bottom
-of all manus disappears.
-
-=== Storing the GPS data on the _Subsurface_ cloud
-
-Activate the main menu and select the _GPS_ option that brings up the submenu
-of GPS-related actions. Tap _Upload GPS data_ that saves the GPS data
-on the _Subsurface_ cloud server. These GPS data are saved *separately*
-from the other dive log data. All collected GPS data are kept on the
-Android device, independent of whether they have been uploaded or not.
-
-=== Downloading GPS data from the _Subsurface_ cloud
-
-Download the GPS data that have been saved on the cloud (possibly by a
-different device) by
-selecting _Download GPS Data_ from the GPS sub-panel.
+the option _GPS -> Disable location service_. The GPS symbol at the bottom
+of all menus disappears.
+|=======
 
 === Viewing GPS data
 
-From the GPS submenu select _Show GPS fixes_. This brings
+From the _GPS_ submenu select _Show GPS fixes_. This brings
 up a list of GPS positions obtained by the location service (image
 below). Two actions are possible for each of the locations, enabled by
-dragging the handle (the dotted matrix on the right below) to the left. This exposes two
+dragging the right part of a location to the left. This exposes two
 options. Tapping the dustbin deletes this particular GPS location. Tapping the
 teardrop-shaped icon (actually a Google Maps pin) opens up Google Maps with a pin
 indicating the exact map position of the GPS record being viewed. The two above
-options can be hidden by drawing the GPS record to the right, again using the handle.
+options can be hidden by drawing the GPS record to the right.
 
 image::mobile-images/gpsmanagement.jpg["FIGURE: GPS management",align="center"]
 
@@ -440,20 +471,21 @@ image::mobile-images/gpsmanagement.jpg["FIGURE: GPS management",align="center"]
 
 Assuming that all the dives have been entered into the dive log or have
 been downloaded from the _Subsurface_ cloud, apply the GPS positions to
-these dives. GPS positions can therefore only be applied to dives in the dive list.
+these dives. GPS positions can only be applied to dives in the dive list.
 From the _Dive management_ sub-panel, tap _Apply GPS fixes_. The dive list contains the start
 and end times of each dive. Now, _Subsurface-mobile_ applies the first
 GPS position that falls within the dive period of each dive. This results
 in a GPS position for each dive that is saved as part of the dive log.
 
-== Using the settings for _Subsurface-mobile_.
+[[S_Settings]]
+== Specifying the settings for _Subsurface-mobile_.
 
-The Settings screen allows the customization of _Subsurface-mobile_. Many of the settings involve dragging a slider switch to activate or deactivate a particular setting.
+The _Settings_ screen allows the customization of _Subsurface-mobile_. Many of the settings involve dragging a slider switch to activate or deactivate a particular setting.
 
 [[S_ChangeCloudAccount]]
 === Changing to a different _Subsurface_ cloud account
 
-Some users have more than one _Subsurface_ cloud account and with a need to switch between accounts. Tap _Settings_ on the Main menu and scroll to the section titled _Cloud status_ (see image below).
+Some users have more than one _Subsurface_ cloud account and have a need to switch between accounts. Tap _Settings_ on the Main menu and scroll to the section titled _Cloud status_ (see image below).
 Tap the _Change_ button. This opens the _Cloud credentials_ screen.
 change the credential information, then tap the button _Sign-in or register_. The appropriate dive list is shown.
 
@@ -461,27 +493,25 @@ image::mobile-images/SettingsCloudTheme.jpg["FIGURE: Settings: Cloud & Theme
 
 === Changing the color theme of _Subsurface-mobile_
 
+[width="100%", frame="None"]
+|=======
+a|image::mobile-images/PinkTheme.jpg["FIGURE: GPS start",align="center"] | 
 _Subsurface-mobile_ has three color schemes to please users with different
-tastes. This user manual shows the default color scheme, comprising blue
+tastes (see image above). This user manual shows the default color scheme, comprising blue
 colors. Change to a pink or a dark color scheme by opening the main menu,
 tap _Settings_, and scroll to the section with heading _Theme_ (see image above).
-Select the appropriate color theme by dragging the appropriate slider on the righthand.
+Select the appropriate color theme by dragging the appropriate slider on the right-hand.
+On the left is the dive list after selecting the Pink theme.
+|=======
 
 === Configuring the GPS webservice
 
 The Settings screen allows one to set up the way in which GPS positions are collected during dives. See the section on xref:S_ConfigureGPS[Configuring the GPS service].
 
-=== Saving a detailed dive computer dive log
-
-Under the heading _Dive computer_, you will find a switch to save a detailed log each time dives are downloaded from a dive computer. This is important for solving problems in downloading dives from the dive computer. When contacting the developers with download problems, you will usually be asked to provide the information in this log, which can be found in the root folder of your local storage device as +libdivecomputer.log+. In the same location you can also find a +subsurfacel.log+ which is always created and which include more information which can be helpful when debugging problems with Subsurface-mobile.
-
-=== Activating the Developer submenu
-
-The information in subsurface.log plus some additional information for understanding the screen rendering of dive information as well as the way in which _Subsurface-mobile_ processed information during a specific occasion while running the app (see section below) is available through a _Developer_ menu at run time. Activate (or deactivate) this menu item on the Main Menu by dragging the slider switch in the Settings screen.
-
-== Developer submenu
+=== Activating the Developer sub-menu
 
-If the Developer submenu has been activated in the Settings screen, the Main menu has a _Developer_ item. By tapping this one has two options that are relevant within
+The information in the subsurface.log generated while running _Subsurface-mobile_, plus some additional information for understanding the screen rendering of dive information as well as the way in which _Subsurface-mobile_ processed information during a specific occasion while running the app (see section below) is available through a _Developer_ menu at run time. Activate (or deactivate) this menu item on the Main Menu by dragging the slider switch in the Settings screen.
+If _Display developer menu_ has been activated in the _Settings screen_, the Main menu has a _Developer_ item. By tapping this one has two options that are relevant within
 the context of program development and debugging.
 
 === App log