Update user manual html files included in the sources

Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
author: Dirk Hohndel <dirk@hohndel.org> 2015-10-13 13:19:27 -0700
committer: Dirk Hohndel <dirk@hohndel.org> 2015-10-13 13:19:27 -0700
commit: c7c686f730a0480483452152c8e0e5efe3257c91 (patch)
tree: 377582213eb6c9d1bec205215fb0cc14b8fc3a18 /Documentation/user-manual.html.git
parent: 409df339b82b67cf4ecf0963f2aa3ca2dc2cf079 (diff)
download: subsurface-c7c686f730a0480483452152c8e0e5efe3257c91.tar.gz
1 files changed, 1766 insertions, 766 deletions
diff --git a/Documentation/user-manual.html.git b/Documentation/user-manual.html.git
index bae97b6af..b27b7ebbd 100644
--- a/Documentation/user-manual.html.git
+++ b/Documentation/user-manual.html.git
@@ -3,7 +3,7 @@
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">
 <head>
 <meta http-equiv="Content-Type" content="application/xhtml+xml; charset=UTF-8" />
-<meta name="generator" content="AsciiDoc 8.6.8" />
+<meta name="generator" content="AsciiDoc 8.6.9" />
 <title></title>
 <style type="text/css">
 /*
@@ -410,7 +410,7 @@ asciidoc.install(3);
 <div class="paragraph"><p><span class="big">USER MANUAL</span></p></div>
 <div class="paragraph"><p><strong>Manual authors</strong>: Willem Ferguson, Jacco van Koll, Dirk Hohndel, Reinout Hoornweg,
 Linus Torvalds, Miika Turkia, Amit Chaudhuri, Jan Schubert, Salvador Cuñat, Pedro Neves</p></div>
-<div class="paragraph"><p><span class="blue"><em>Version 4.4,  February 2015</em></span></p></div>
+<div class="paragraph"><p><span class="blue"><em>Version 4.5, October 2015</em></span></p></div>
 <div class="paragraph"><p>Welcome as a user of <em>Subsurface</em>, an advanced dive logging program with
 extensive infrastructure to describe, organise, interpret and print scuba
 and free dives. <em>Subsurface</em> offers many advantages over other similar
@@ -452,6 +452,12 @@ Do you need an intuitive graphical dive planner that integrates with and takes
    into account the dives that have already been logged?
 </p>
 </li>
+<li>
+<p>
+Do you need a way of storing or backing up your dive log on the Internet, allowing
+   you to view your dive log from anywhere, using an Internet browser?
+</p>
+</li>
 </ul></div>
 <div class="paragraph"><p><em>Subsurface</em> binaries are available for Windows PCs (Win XP or later), Intel
 based Macs (OS/X) and many Linux distributions. <em>Subsurface</em> can be built for
@@ -500,7 +506,7 @@ command line.</p></div>
 <h2 id="S_StartUsing">3. Start Using the Program</h2>
 <div class="sectionbody">
 <div class="paragraph"><p>The <em>Subsurface</em> window is usually divided into four panels with a <strong>Main
-Menu</strong> (File Import Log View Filter Help) at the top of the window (for Windows
+Menu</strong> (File Import Log View Help) at the top of the window (for Windows
 and Linux) or the top of the screen (for Mac and Ubuntu Unity). The four panels are:</p></div>
 <div class="olist arabic"><ol class="arabic">
 <li>
@@ -521,7 +527,7 @@ and centred on the site of the last dive selected in the <strong>Dive List</stro
 </li>
 <li>
 <p>
-The <strong>Dive Info</strong> to the top left, giving more detailed information on the
+The <strong>Info</strong> to the top left, giving more detailed information on the
 dive selected in the <strong>Dive List</strong>, including some statistics for the selected dive or for all
 highlighted dive(s).
 </p>
@@ -537,16 +543,16 @@ selected dive in the <strong>Dive List</strong>.
 the panels. <em>Subsurface</em> remembers the position of the dividers, so the next
 time <em>Subsurface</em> starts it uses the positions of the dividers from when the program
 was last used.</p></div>
-<div class="paragraph"><p>If a dive is selected in the <strong>Dive List</strong>, the dive location, detailed information
+<div class="paragraph"><p>If a single dive is selected in the <strong>Dive List</strong>, the dive location, detailed information
 and profile of
 the <em>selected dive</em> are shown in the respective panels. On the other hand, if
-one highlights more than one dive the last highlighted dive is the <em>selected
+several dives are selected, the last highlighted dive is the <em>selected
 dive</em>, but summary data of all <em>highlighted dives</em> are shown in the <strong>Stats</strong> tab
-of the <strong>Dive Info</strong> panel (maximum, minimum and average depths, durations, water
+of the <strong>Info</strong> panel (maximum, minimum and average depths, durations, water
 temperatures and SAC; total time and number of dives selected).</p></div>
 <div class="imageblock" id="S_ViewPanels" style="text-align:center;">
 <div class="content">
-<img src="images/main_window_f20.jpg" alt="The Main Window" />
+<img src="images/main_window_f22.jpg" alt="The Main Window" />
 </div>
 </div>
 <div class="paragraph"><p>The user can determine which of the four panels are displayed by selecting the
@@ -555,7 +561,7 @@ display:</p></div>
 <div class="paragraph"><p><strong>All</strong>: show all four of the panels as in the screenshot above.</p></div>
 <div class="paragraph"><p><strong>Divelist</strong>: Show only the Dive List.</p></div>
 <div class="paragraph"><p><strong>Profile</strong>: Show only the Dive Profile of the selected dive.</p></div>
-<div class="paragraph"><p><strong>Info</strong>: Show only the Dive Notes about the last selected dive and statistics for
+<div class="paragraph"><p><strong>Info</strong>: Show only the Notes about the last selected dive and statistics for
 all highlighted dives.</p></div>
 <div class="paragraph"><p><strong>Globe</strong>: Show only the world map, centred on the last selected dive.</p></div>
 <div class="paragraph"><p>Like many other functions that can be accessed via the Main Menu, these options
@@ -608,7 +614,7 @@ Import dive log information that has been maintained either as a spreadsheet
 <div class="ulist"><ul>
 <li>
 <p>
-The divecomputer itself. See: <a href="#S_ImportDiveComputer">Importing new dive information from a Dive Computer</a> or
+The dive computer itself. See: <a href="#S_ImportDiveComputer">Importing new dive information from a Dive Computer</a> or
 </p>
 </li>
 <li>
@@ -633,230 +639,31 @@ depth, the names of your dive buddy and of the dive master or dive guide, and
 some remarks about the dive. <em>Subsurface</em> can store much more information
 than this for each dive. In order to add a dive to a dive log, select <em>Log
 &#8594;  Add Dive</em> from the Main Menu. The program then shows three panels to enter
-information for a dive: two tabs in the <strong>Dive Info</strong> panel (<strong>Dive Notes</strong> and
+information for a dive: two tabs in the <strong>Info</strong> panel (<strong>Notes</strong> and
 <strong>Equipment</strong>), as well as the <strong>Dive Profile</strong> panel that displays a graphical profile
 of each dive. These panels are respectively marked <span class="red">A</span>, <span class="red">B</span> and
 <span class="red">C</span>
 in the figure below. Each of these tabs will now be explained for data entry.</p></div>
 <div class="imageblock" style="text-align:center;">
 <div class="content">
-<img src="images/AddDive1_f20.jpg" alt="FIGURE: Add dive" />
+<img src="images/AddDive1_f22.jpg" alt="FIGURE: Add dive" />
 </div>
 </div>
-<div class="paragraph"><p>When one edits a field in Dive notes or Equipment panels, <em>Subsurface</em> enters <strong>Editing Mode</strong>,
-indicated by the message in the blue box at the top of the <em>Dive Notes</em> panel (see the image below). This message is
-displayed in all the panels under Dive notes and Equipment when in <strong>Editing Mode</strong>.</p></div>
+<div class="paragraph"><p>When one edits a field in Notes or Equipment panels, <em>Subsurface</em> enters <strong>Editing Mode</strong>,
+indicated by the message in the blue box at the top of the <strong>Notes</strong> panel (see the image below). This message is
+displayed in all the panels under Notes and Equipment when in <strong>Editing Mode</strong>.</p></div>
 <div class="imageblock" style="text-align:center;">
 <div class="content">
-<img src="images/BlueEditBar_f20.jpg" alt="Blue edit bar" />
+<img src="images/BlueEditBar_f22.jpg" alt="Blue edit bar" />
 </div>
 </div>
-<div class="paragraph"><p>The <em>Save</em> button should only be selected after all the parts of a dive have been entered.
+<div class="paragraph"><p>The <em>Apply changes</em> button should only be selected after all the parts of a dive have been entered.
 When entering dives by hand, the <em>Info</em>, <em>Equipment</em> and <em>Profile</em> tabs should be completed
-before saving the information. By selecting the <em>Save</em> button, a local copy of the information
+before saving the information. By selecting the <em>Apply changes</em> button, a local copy of the information
 for this specific dive is saved in memory. When one closes Subsurface, the program will
 ask again, this time whether the complete dive log should be saved on disk or not.</p></div>
 <div class="sect3">
-<h4 id="_dive_notes">5.1.1. Dive Notes</h4>
-<div class="paragraph"><p>This panel contains the date, time and place information for a particular dive,
-environmental conditions, co-divers and buddies, as well as some descriptive
-information. If one clicks on the <strong>Dive Notes</strong> tab, the following
-fields are visible:</p></div>
-<div class="imageblock" style="text-align:center;">
-<div class="content">
-<img src="images/AddDive2_f20.jpg" alt="FIGURE: The Dive Notes tab" />
-</div>
-</div>
-<div class="paragraph"><p>The <strong>Time</strong> field reflects the date and the time of the dive. By clicking
-the date, a calendar is displayed from which
-one can choose the correct date. Press ESC to escape from the calendar.
-The time values (hour and minutes) can also be
-edited directly by clicking on each of them in the text box and by overtyping the
-information displayed. The default date is the present date and the default time is
-an hour in advance of the present time.</p></div>
-<div class="paragraph"><p><strong>Air and water temperatures</strong>: the air and water temperatures during the
-dive can be typed directly on the fields to the right of the Start time.
-Temperature units are not needed, as they will be automatically supplied by
-<em>Subsurface</em>. Only the numerical value must be
-typed by the user (the units selected in the <em>Preferences</em>
-will determine whether metric or imperial units are used).</p></div>
-<div class="paragraph"><p><strong>Location</strong>: Here the name of the dive site can be entered, e.g. "Tihany, Lake
-Balaton,
-Hungary". Auto completion of location names will make this easier if one
-frequently dives at the same sites.</p></div>
-<div class="paragraph"><p><strong>Coordinates</strong>: The geographic coordinates of the dive site should be entered
-here. These can come from three sources:</p></div>
-<div class="olist loweralpha"><ol class="loweralpha">
-<li>
-<p>
-One can find the coordinates on the world map in the bottom right hand
-   part
-   of the Subsurface window. The map displays a green bar indicating "No location
-   data - Move the map and double-click to set the dive location". Upon a double-click
-   at the appropriate place, the green bar disappears and the coordinates are
-   stored.
-</p>
-</li>
-<li>
-<p>
-The coordinates can be obtained from the <em>Subsurface</em> Companion app if the
-   user has an Android or iPhone device with GPS and if the coordinates of the dive site
-   were stored using that device.
-   <a href="#S_Companion">Click here for more information</a>
-</p>
-</li>
-<li>
-<p>
-The coordinates can be entered by hand if they are known, using one of
-   four formats with latitude followed by longitude:
-</p>
-<div class="literalblock">
-<div class="content">
-<pre><code>ISO 6709 Annex D format e.g. 30°13'28.9"N 30°49'1.5"E
-Degrees and decimal minutes, e.g. N30° 13.49760' , E30° 49.30788'
-Degrees minutes seconds, e.g. N30° 13' 29.8" , E30° 49' 1.5"
-Decimal degrees, e.g. 30.22496 , 30.821798</code></pre>
-</div></div>
-</li>
-</ol></div>
-<div class="paragraph"><p>Southern hemisphere latitudes are given with a <strong>S</strong>, e.g. S30°, or with a
-negative value, e.g. -30.22496. Similarly western longitudes are given with a
-<strong>W</strong>, e.g. W07°, or with a negative value, e.g. -7.34323.</p></div>
-<div class="paragraph"><p>Some keyboards don&#8217;t have the degree sign (°). It can be replaced by a d like
-that: N30d W20d.</p></div>
-<div class="paragraph"><p>Please note that GPS coordinates of a dive site are linked to the Location
-name - so adding coordinates to dives that do not have a location description
-will cause unexpected behaviour (Subsurface will think that all of these
-dives have the same location and try to keep their GPS coordinates the
-same).</p></div>
-<div class="paragraph"><p><strong>Dive mode</strong>: This is a dropdown box allowing one to choose the type of dive
-performed. The options are OC (Open Circuit, the default setting, meant for most recreational dives),
-Freedive (dive without SCUBA equipment), CCR (Closed-circuit
-rebreather) and pSCR (Passive semi-closed rebreather).</p></div>
-<div class="paragraph"><p><strong>Divemaster</strong>: The name of the dive master or dive guide for this dive can be
-entered here.
-Again, this field offers auto completion based on the list of dive masters in
-the current logbook.</p></div>
-<div class="paragraph"><p><strong>Buddy</strong>: In this field one can enter the name(s) of the buddy / buddies
-(separated by commas) who accompanied the user on the dive. Auto completion
-is offered based on the list of buddies in the current logbook.</p></div>
-<div class="paragraph"><p><strong>Suit</strong>: The type of diving suit used for the dive can be entered here.
-As with the other items, auto completion of the suit description is available.
-Some dry-suit users may choose to use this field to record what combination of
-suit and thermal protection undersuit was used.</p></div>
-<div class="paragraph"><p><strong>Rating</strong>: One can provide a subjective overall rating of the dive on a
-5-point scale by clicking the appropriate star on the rating scale.</p></div>
-<div class="paragraph"><p><strong>Visibility</strong>: Similarly, one can provide a rating of visibility during the
-dive on a
-5-point scale by clicking the appropriate star.</p></div>
-<div class="paragraph"><p><strong>Tags</strong>: Tags that describe the type of dive performed may
-be entered here (separated by commas). Examples of common tags are boat, drift,
-training, cave etc. <em>Subsurface</em> has many built-in tags. Auto completion is once again offered.
-For instance, if <code>cav</code> was typed, then the tags <strong>cave</strong> and <strong>cavern</strong> are
-shown for the user to choose from.</p></div>
-<div class="paragraph"><p><strong>Notes</strong>: Any additional information can be typed here.</p></div>
-<div class="paragraph"><p>The <strong>Save</strong> and <strong>Cancel</strong> buttons are used to save all the information for tabs in
-the info panel and in the dive profile panel, so there&#8217;s no need to use them
-until ALL other information has been added. Here is an example of a completed
-Dive Notes panel:</p></div>
-<div class="imageblock" style="text-align:center;">
-<div class="content">
-<img src="images/CompletedDiveInfo_f20.jpg" alt="FIGURE: A completed Dive Notes tab" />
-</div>
-</div>
-</div>
-<div class="sect3">
-<h4 id="_equipment">5.1.2. Equipment</h4>
-<div class="paragraph"><p>The Equipment tab allows the user to enter information about the type of
-cylinder and gas used, as well as the weights used for a dive. This is a highly interactive part of
-<em>Subsurface</em> and the information on
-cylinders and gases (entered here) affects the behaviour of the dive profile
-(top right-hand panel).</p></div>
-<div class="paragraph" id="S_CylinderData"><p><strong>Cylinders</strong>: The cylinder information is entered through a dialogue that looks
-like this:</p></div>
-<div class="imageblock" style="text-align:center;">
-<div class="content">
-<img src="images/Gas_dialogue1_f20.jpg" alt="FIGURE:Initial cylinder dialogue" />
-</div>
-</div>
-<div class="paragraph"><p>The + button at the top right allows the user to add more cylinders for this
-dive.
-The dark dustbin icon on the left allows one to delete information for a
-particular cylinder. Note that it is not possible to delete a cylinder if it is used during the
-dive. One cylinder is implicitly used in the dive, even without a gas change event. Thus the first
-cylinder cannot be deleted until another cylinder is created.</p></div>
-<div class="paragraph"><p>Start by selecting a cylinder type on the left-hand side of the
-table.  To select a cylinder, click in the <strong>Type</strong> box.
-This brings up a button that can be used to display a dropdown list of
-cylinders:</p></div>
-<div class="imageblock" style="text-align:center;">
-<div class="content">
-<img src="images/Gas_dialogue2_f20.jpg" alt="FIGURE:The cylinder drop-down list button" />
-</div>
-</div>
-<div class="paragraph"><p>The drop-down list can be used to select the cylinder type used
-for the dive or the user may start typing in the box which shows the
-available options for the entered characters. The
-<strong>Size</strong> of the cylinder as well as its working pressure (<strong>WorkPress</strong>) will
-automatically be shown in the dialogue. If a cylinder is not shown in the dropdown list,
-type the name and description of that cylinder into the <strong>Type</strong> field.</p></div>
-<div class="paragraph"><p>Next, indicate the starting pressure and the ending pressure of
-the
-gas used during the dive. The unit of pressure (metric/imperial) corresponds
-to the setting in the <em>Preferences</em>.</p></div>
-<div class="paragraph"><p>Finally, type in the gas mixture used in the <strong>O2%</strong> field. If air
-was used, a value of 21% can be entered on this field,  or it might be
-left blank. If nitrox or trimix were used, their percentages of oxygen and/or
-helium must be specified.
-Any inappropriate fields should be left empty. After typing the information for
-the cylinder, press <em>ENTER</em> on the keyboard or click
-outside the cell that contains the cursor. Information for any additional
-cylinders can be added by using the + button at the top right hand. Following
-is an example of a complete description for a
-dive made using two cylinders (air and EAN50):</p></div>
-<div class="imageblock" style="text-align:center;">
-<div class="content">
-<img src="images/CylinderDataEntry3_f20.jpg" alt="FIGURE: a completed cylinder dive information table" />
-</div>
-</div>
-<div class="paragraph"><p><strong>Weights</strong>: Information about the weight system used during a dive can be entered
-using a dialogue very similar to that for the cylinder information. If the user
-clicks the + button on the top right of the weights dialogue, the table looks
-like this:</p></div>
-<div class="imageblock" style="text-align:center;">
-<div class="content">
-<img src="images/WeightsDataEntry1_f20.jpg" alt="FIGURE: The Weights dialogue" />
-</div>
-</div>
-<div class="paragraph"><p>If one then clicks on the <strong>Type</strong> field, a drop-down list becomes accessible
-through a down-arrow:</p></div>
-<div class="imageblock" style="text-align:center;">
-<div class="content">
-<img src="images/WeightsDataEntry2_f20.jpg" alt="FIGURE: Weights type drop-down list button" />
-</div>
-</div>
-<div class="paragraph"><p>The drop-down list can then be used to select the type of weight system or the user may start
-typing in the box which shows the available options for the entered characters. In
-the <strong>Weight</strong>
-field, the weight used during the dive must be typed. After typing the
-information
-for the weight system the user must either press <em>ENTER</em> on the keyboard or
-click outside the
-cell that contains the cursor. It is possible to enter
-information for more than one weight system by adding an additional system using
-the + button on the top right hand. Weight systems can be deleted using the
-dustbin icon on the left hand. Here is an example of information for a dive
-with two types of weights: integrated and a weight belt:</p></div>
-<div class="imageblock" style="text-align:center;">
-<div class="content">
-<img src="images/WeightsDataEntry3_f20.jpg" alt="FIGURE: A completed weights information table" />
-</div>
-</div>
-<div class="paragraph"><p>There&#8217;s NO need to click the <em>Save</em> button before the dive
-profile has been completed.</p></div>
-</div>
-<div class="sect3">
-<h4 id="S_CreateProfile">5.1.3. Creating a Dive Profile</h4>
+<h4 id="S_CreateProfile">5.1.1. Creating a Dive Profile</h4>
 <div class="paragraph"><p>The <strong>Dive Profile</strong> (a graphical representation of the depth of the dive as a
 function of time) is indicated in the panel on the top right hand of the
 <em>Subsurface</em> window. When a dive is manually added to a logbook, <em>Subsurface</em>
@@ -868,9 +675,9 @@ dive being described:</p></div>
 </div>
 </div>
 <div class="paragraph"><p><em>Modifying the dive profile</em>: When the cursor is moved around the dive profile,
-its position is indicated by two coloured lines (red and green) as shown below.
-The depth and time
-that the cursor represents are indicated at the top of the black information box
+its position is indicated by two right-angled red lines as shown below.
+The time and depth
+represented by the cursor are indicated at the top of the black information box
 (@ and D). The units (metric/imperial) on the axes are determined by the
 <strong>Preference</strong> settings. The dive profile itself comprises several
 line segments demarcated by waypoints (white dots on the profile, as shown
@@ -879,9 +686,9 @@ If the dive depth was 20 m then the user needs to drag the appropriate waypoints
 downwards to represent 20 m. To add a waypoint, double-click on
 any line segment. To move an additional waypoint, drag it.
 To remove this waypoint, right-click on it and choose "Remove this point" from the
-context menu. The user needs to drag the waypoints to represent an
+context menu. Drag the waypoints to represent an
 accurate
-time duration for the dive. Below is a dive profile that represents a dive
+time duration for the dive. Below is a dive profile for a dive
 to 20 m for 30 min, followed by a 5 minute safety stop at 5 m.</p></div>
 <div class="imageblock" style="text-align:center;">
 <div class="content">
@@ -891,38 +698,23 @@ to 20 m for 30 min, followed by a 5 minute safety stop at 5 m.</p></div>
 <div class="paragraph"><p><em>Specifying the gas composition:</em> The gas composition used is clearly indicated
 along the line segments of the dive profile. This defaults to the first gas
 mixture specified in the <strong>Equipment</strong> tab, which was air in the case of the
-profile illustrated above. The gas mixtures of segments of the dive profile can
+profile above. The gas mixtures of segments of the dive profile can
 be edited. This is done by right-clicking on the particular
 waypoint and selecting the appropriate gas from the context menu. Changing
 the gas for a waypoint affects the gas shown in the segment <em>to the left</em> of
 that
 waypoint. Note that only the gases defined in the <strong>Equipment</strong> tab appear in the
-context menu.</p></div>
+context menu (see image below).</p></div>
 <div class="imageblock" style="text-align:center;">
 <div class="content">
 <img src="images/DiveProfile3_f20.jpg" alt="FIGURE: Gas composition context menu" />
 </div>
 </div>
-<div class="paragraph"><p>Below is the profile of a dive to 25 m for 30 min and with a switch from air to
-EAN50 at the end of the duration at 20m. In this case the first cylinder in the
-<strong>Equipment</strong> tab contained air and the second cylinder contained EAN50.</p></div>
-<div class="imageblock" style="text-align:center;">
-<div class="content">
-<img src="images/DiveProfile4_f20.jpg" alt="FIGURE: Completed dive profile" />
-</div>
-</div>
-</div>
-<div class="sect3">
-<h4 id="_saving_the_hand_entered_dive_information">5.1.4. Saving the hand-entered dive information</h4>
-<div class="paragraph"><p>The information entered in the <strong>Dive Notes</strong> tab, the <strong>Equipment</strong> tab as well as
-the <strong>Dive Profile</strong> can now be saved in the user&#8217;s logbook by using the two
-buttons
-on the top right hand of the Dive Notes tab. If the <em>Save</em> button is clicked,
-the dive data
-are saved in the current logbook. If the <em>Cancel</em> button is clicked, the newly
-entered
-dive data are discarded. When exiting <em>Subsurface</em>, the user will be prompted
-once more to save the logbook with the new dive(s).</p></div>
+<div class="paragraph"><p>With the profile having been defined, more details must be added in order to have
+a fuller record of the dive. To do this,
+the <strong>Notes</strong> and the <strong>Equipment</strong> tabs on the top left hand of the
+<em>Subsurface</em> window should be used. Click on
+<a href="#S_Notes_dc"><strong>this link</strong></a> for instructions to use these tabs.</p></div>
 </div>
 </div>
 <div class="sect2">
@@ -981,12 +773,12 @@ The interface cable should be connected to a free USB port (or the Infra-red
 <li>
 <p>
 The dive computer should be placed into PC Communication mode.
-        (Users should refer to the manual of their specific dive computer)
+        (Refer to the manual of the specific dive computer)
 </p>
 </li>
 <li>
 <p>
-In <em>Subsurface</em>, from the Main Menu, the user must select <em>Import &#8594;  Import
+In <em>Subsurface</em>, from the Main Menu, select <em>Import &#8594;  Import
    From Dive Computer</em>.
    Dialogue <strong>A</strong> in the figure below appears:
 </p>
@@ -999,13 +791,10 @@ In <em>Subsurface</em>, from the Main Menu, the user must select <em>Import &#85
 </div>
 <div class="paragraph"><p>Dive computers tend to keep a certain number of dives in their memory, even
 though these dives have already been imported to <em>Subsurface</em>. For that reason, if
-the divecomputer allows this,
+the dive computer allows this,
 <em>Subsurface</em> only imports dives that have not been uploaded before. This makes
 the download process faster on most dive computers and also saves battery power
-of the dive computer (at least for those not charging while connected via USB).
-If, for some reason, the user wishes to import ALL dives from the dive computer,
-even though some may already be in the logbook, then check the check box labeled
-<em>Force download of all dives</em>.</p></div>
+of the dive computer (at least for those not charging while connected via USB).</p></div>
 <div class="ulist"><ul>
 <li>
 <p>
@@ -1050,7 +839,7 @@ If the checkbox <em>Always prefer downloaded dives</em>
    has been checked and, during download, dives with identical date-times exist on
    the dive computer and on the <em>Subsurface</em>
    <strong>Dive List</strong> panel, the dive in the <em>Subsurface</em> divelog will be overwritten
-   by the dive record from the dive computer
+   by the dive record from the dive computer.
 </p>
 </li>
 <li>
@@ -1068,36 +857,30 @@ Do <strong>not</strong> check the checkboxes labelled <em>Save libdivecomputer l
 </li>
 <li>
 <p>
-Then select the <em>Download</em> button. After successful download, Dialogue <strong>B</strong>
-   in the figure above appears.
-</p>
-</li>
-<li>
-<p>
-With communication established, one can see how the data are
+Then select the <em>Download</em> button.
+   With communication established, one can see how the data are
    retrieved from the dive computer.
    Depending on the make of the dive computer and/or number of recorded dives, this
    could take some time. Be patient. The <em>Download</em> dialogue
    shows a
    progress bar at the bottom of the dialogue (for some dive computers the
    progress information could be inaccurate as we cannot determine how much
-   downloadable data there is until all data have been downloaded). When the
-   download of the dive information is complete, all the imported dives appear
+   downloadable data there is until all data have been downloaded). After successful download, Dialogue <strong>B</strong>
+   in the figure above appears.
+   After the dives have been downloaded, they appear in a tabular format on the right-hand
+   side of the dialogue (see image <strong>B</strong>, above). Each dive comprises a row in the table, with the date, duration
+   and depth shown. Next to each dive is a checkbox: check all the dives that need to
+   be transferred to the <strong>Dive List</strong>. In the case of the image above, the last six dives are
+   checked and will be transferred to the <strong>Dive List</strong>. Then
+   click the <em>OK</em> button at the bottom of the dialogue. All the imported dives appear
    in the <strong>Dive List</strong>, sorted by date and time. Disconnect and
    switch off the dive
    computer to conserve its battery power.
-   If a particular dive is selected, the <strong>Dive Profile</strong> panel shows an informative
-   graph of dive depth against time for that particular dive.
 </p>
 </li>
 </ul></div>
-<div class="paragraph"><p>After the dives have been downloaded, they appear in a tabular format on the righthand
-side of the dialogue (see image <strong>B</strong>, above). Each dive comprises a row in the table, with the date, duration
-and depth shown. Next to each dive is a checkbox: check all the dives that need to
-be transfered to the <strong>Dive List</strong>. In the case of the image above, the last six dives are
-checked and will be transfered to the <strong>Dive List</strong>.</p></div>
 <div class="paragraph"><p>After this has been completed, select the OK button.
-The checked dives are transfered to the <strong>Dive List</strong>.</p></div>
+The checked dives are transferred to the <strong>Dive List</strong>.</p></div>
 <div class="ulist"><ul>
 <li>
 <p>
@@ -1187,13 +970,154 @@ as well as contextual information about the dives recorded on the dive computer.
 </div></div>
 </div>
 <div class="sect3">
-<h4 id="S_DeviceNames">5.2.2. Changing the name of a dive computer</h4>
+<h4 id="S_Bluetooth">5.2.2. Connecting <em>Subsurface</em> to a Bluetooth-enabled dive computer</h4>
+<div class="paragraph"><p>Bluetooth is becoming a more common way of communication between dive computers
+and <em>Subsurface</em>, for instance, the Shearwater Petrel
+Mk2 and the OSTC Mk3. <em>Subsurface</em> provides a largely operating system independent
+Bluetooth interface. Setting up <em>Subsurface</em> for Bluetooth communication requires
+four steps:</p></div>
+<div class="ulist"><ul>
+<li>
+<p>
+Ensure that Bluetooth is activated on the host computer running <em>Subsurface</em>.
+</p>
+</li>
+<li>
+<p>
+Ensure that <em>Subsurface</em> sees the Bluetooth adapter on the host computer.
+</p>
+</li>
+<li>
+<p>
+Ensure the Bluetooth-enabled dive computer is Bluetooth-discoverable and in PC upload mode.
+</p>
+</li>
+<li>
+<p>
+Ensure that <em>Subsurface</em> is paired with the Bluetooth-enabled dive computer.
+</p>
+</li>
+</ul></div>
+<div class="paragraph"><p>Select the Download dialogue by selecting
+<em>Import &#8594; Import from dive computer</em> from the <strong>Main Menu</strong>. If one checks the
+check box labelled <em>"Choose Bluetooth download mode"</em>, the dialogue below appears.</p></div>
+<div class="sect4">
+<h5 id="_on_linux_or_macos">On Linux or MacOS:</h5>
+<div class="imageblock" style="text-align:center;">
+<div class="content">
+<img src="images/DC_import_Bluetooth.jpg" alt="FIGURE: Download Bluetooth" />
+</div>
+</div>
+<div class="paragraph"><p>On the <em>Linux</em> or <em>MacOS</em> platforms the name
+of the <em>Subsurface</em> computer and its Bluetooth address are shown on the right-hand side, On the lefthand side, if the
+computer has connected more than one local Bluetooth devices the user can use
+the list box to indicate which one needs to connect to <em>Subsurface</em>.
+The power state (on/off) of the Bluetooth adapter is shown below
+the address and can be changed by checking the <em>Turn on/off</em> check box.</p></div>
+<div class="paragraph"><p>If the Bluetooth address is not shown, then <em>Subsurface</em> does not see the local
+Bluetooth device. Ensure that the Bluetooth driver is installed correctly on the
+<em>Subsurface</em> computer and check if it can be used by other Bluetooth utilities like
+<em>bluetoothctl</em> or <em>bluemoon</em>. This achieves the first two steps above.</p></div>
+<div class="paragraph"><p>Ensure that the Bluetooth-enabled dive computer is in PC-upload mode and that it
+is discoverable by other Bluetooth devices. Consult the manual of the dive
+computer to perform this. Now the third item in the list above has been achieved.</p></div>
+<div class="paragraph"><p>Select the <em>Scan</em> button towards the bottom left of the dialogue above. After
+searching for a small amount of time, the dive computer should be listed
+(perhaps as one of a number of Bluetooth devices) in the main list box on the
+lefthand side of the dialogue (see image above). If this is not achieved, select
+the <em>Clear</em> button and then scan again for Bluetooth devices using the <em>Scan</em>
+button. After performing these actions <em>Subsurface</em> should see the dive computer.
+The label of the discovered dive computer contains the name of the device, its
+address and its pairing status. If the device is not paired and has a red
+background colour, a context menu can be opened by selecting the item with a
+right-click.
+Select the the <em>Pair</em> option and wait for the task to complete.</p></div>
+<div class="sidebarblock">
+<div class="content">
+<div class="admonitionblock">
+<table><tr>
+<td class="icon">
+<img src="images/icons/important.png" alt="Important" />
+</td>
+<td class="content">Currently <em>Subsurface</em> does not support Bluetooth pairing with dive
+computers that require a custom PIN code. In order to pair the devices, use other
+OS utilities as suggested below.</td>
+</tr></table>
+</div>
+<div class="paragraph"><p>One way to achieve this is to use <code>bluetoothctl</code>:</p></div>
+<div class="literalblock">
+<div class="content">
+<pre><code>$ bluetoothctl
+[bluetooth]# agent KeyboardOnly
+Agent registered
+[bluetooth]# default-agent
+Default agent request successful
+[bluetooth]# pair 00:80:25:49:6C:E3
+Attempting to pair with 00:80:25:49:6C:E3
+[CHG] Device 00:80:25:49:6C:E3 Connected: yes
+Request PIN code
+[agent] Enter PIN code: 0000</code></pre>
+</div></div>
+</div></div>
+<div class="paragraph"><p>After the devices are paired the <em>Save</em> button of the dialogue can be pressed.
+This closes the Bluetooth dialogue. Now select <em>Download</em> in the <em>Download from
+dive computer</em> dialogue which should still be open. The downloaded dives are
+shown on the righthand side of the download dialogue.</p></div>
+</div>
+<div class="sect4">
+<h5 id="_on_windows">On Windows:</h5>
+<div class="imageblock" style="text-align:center;">
+<div class="content">
+<img src="images/DC_import_Bluetooth_Windows.png" alt="FIGURE: Download Bluetooth on Windows" />
+</div>
+</div>
+<div class="paragraph"><p>On <em>Windows</em> platforms the <em>Local Bluetooth device details section</em> on the right is not displayed.
+To successfully initiate a scan (by pressing the <em>Scan</em> button)
+check that the Bluetooth device on the <em>Subsurface</em> computer is turned on.</p></div>
+<div class="paragraph"><p>The pairing step is checked and done automatically during
+the download process. If the devices have never been paired the system will ask
+for your permissions and put a message on the right side of the screen: <em>Add a
+device, Tap to set up your DC device</em>. Always allow this pairing. After a
+discovered item is selected, select the <em>Save</em> button.
+Finally select the <em>Download</em> button on the <em>Download</em> dialogue and wait for the process to complete.</p></div>
+<div class="admonitionblock">
+<table><tr>
+<td class="icon">
+<img src="images/icons/important.png" alt="Important" />
+</td>
+<td class="content">Be aware that currently <em>Subsurface</em> works only with local Bluetooth
+adapters which use Microsoft Bluetooth Stack. If the local device uses
+<em>Widcomm</em>,  <em>Stonestreet One Bluetopia Bluetooth</em> or <em>BlueSolei</em> drivers it
+will definitely not work.</td>
+</tr></table>
+</div>
+<div class="paragraph"><p>A log messageOn the bottom left of the <em>Remote Bluetooth device selection</em>
+shows details about the current status of the Bluetooth agent. To
+select another dive computer for download using the "Remote Bluetooth selection dialogue"
+press the three-dots button from the <em>"Choose Bluetooth download mode"</em> option.</p></div>
+<div class="admonitionblock">
+<table><tr>
+<td class="icon">
+<img src="images/icons/important.png" alt="Important" />
+</td>
+<td class="content"><strong>IN CASE OF PROBLEMS</strong>:  If the Bluetooth adapter from the <em>Subsurface</em> computer
+gets stuck and the <em>Download</em> process fails repeatedly,
+ <em>unpair</em> the devices and then repeat the above steps. If this is not successful,
+ <a href="#S_HowFindBluetoothDeviceName"><em>Appendix A</em></a> contains
+information for manually setting up and inspecting the Bluetooth connection
+with <em>Subsurface</em>.</td>
+</tr></table>
+</div>
+</div>
+</div>
+<div class="sect3">
+<h4 id="S_DeviceNames">5.2.3. Changing the name of a dive computer</h4>
 <div class="paragraph"><p>It may be necessary to distinguish between different dive computers used to
 upload dive logs to <em>Subsurface</em>. For instance if one&#8217;s partner&#8217;s dive computer is the
 same make and model as one&#8217;s own and dive logs are uploaded from both dive computers
 to the same <em>Subsurface</em> computer, then
 one would perhaps like to call one dc "Alice&#8217;s Suunto D4" and the other one
-"Bob&#8217;s Suunto D4". Alternatively, perhaps a technical diver dives with two or more
+"Bob&#8217;s Suunto D4". Alternatively, consider a technical diver dives with two or more
 dive computers of the same model, the logs of both (or all) being uploaded.
 In this case it might be prudent to call one of them
 "Suunto D4 (1)" and another one "Suunto D4 (2)". This is easily done in <em>Subsurface</em>.
@@ -1204,65 +1128,102 @@ show the nickname for that particular device instead of the model name,
 allowing easy identification of devices.</p></div>
 </div>
 <div class="sect3">
-<h4 id="S_EditDiveInfo">5.2.3. Updating the dive information imported from the dive computer.</h4>
+<h4 id="S_EditDiveInfo">5.2.4. Updating the dive information imported from the dive computer.</h4>
 <div class="paragraph"><p>With the uploaded dives in the <strong>Dive List</strong>, the information from the dive
 computer is not complete and more details must be added in order to have
 a fuller record of the dives. To do this,
-the <strong>Dive Notes</strong> and the <strong>Equipment</strong> tabs on the top left hand of the
+the <strong>Notes</strong> and the <strong>Equipment</strong> tabs on the top left hand of the
 <em>Subsurface</em> window should be used.</p></div>
-</div>
-<div class="sect3">
-<h4 id="_dive_notes_2">5.2.4. Dive Notes</h4>
-<div class="paragraph"><p>The date and time of the dive, gas mixture and (often) water temperature are usually
-shown as obtained from the dive computer, but the user needs to add
-additional information by hand in order to have a more complete dive record. In a few cases,
-(e.g. APD rebreathers) one also has to provide the date and time of the dive.
-If the contents of this tab is changed or edited in any way, the message in a blue box at
+<div class="sect4">
+<h5 id="S_Notes_dc">Notes</h5>
+<div class="paragraph"><p>To have a more complete dive record the user needs to add
+additional information by hand. The procedure
+below is virtually identical for hand-entered dives and for dives downloaded from a dive computer.</p></div>
+<div class="paragraph"><p>In some cases,
+one has to provide the date and time of the dive, e.g. when entering a dive by hand or when a
+dive computer does not provide the date and time of the dive.
+(Usually the date and time of the dive, gas mixture and water temperature are
+shown as obtained from the dive computer)
+If the contents of the <strong>Notes tab</strong> is changed or edited in any way, the message in a blue box at
 the top of the panel indicates that the dive is being edited. If one
-clicks on the <strong>Dive Notes</strong> tab, the following fields are
-visible:</p></div>
+clicks on the <strong>Notes</strong> tab, the following fields are
+visible (left hand image, below):</p></div>
 <div class="imageblock" style="text-align:center;">
 <div class="content">
-<img src="images/AddDive3_f20.jpg" alt="FIGURE: The Dive Notes tab" />
+<img src="images/AddDive3_f22.jpg" alt="FIGURE: The Notes tab" />
 </div>
 </div>
-<div class="paragraph"><p>The <strong>Time</strong> field reflects the date and time of the dive. By clicking
+<div class="paragraph"><p>The right hand image, above, shows a <strong>Notes tab</strong> filled with dive information.
+The <strong>Time</strong> field reflects the date and time of the dive. By clicking
 the date, a calendar is displayed from which
 one can choose the correct date. Press ESC to close the calendar.
 The time values (hour and minutes) can also be
-edited directly by clicking on each of them in the text box and by overtyping the
+edited directly by clicking on each of them in the text box and by over-typing the
 information displayed.</p></div>
 <div class="paragraph"><p><strong>Air/water temperatures</strong>: Air and water temperatures during the dive are shown
-in these fields to the right of the Start time. Many dive computers supply water
-temperature information and this field may therefore contain information obtained from the dive computer.
+in text boxes to the right of the Start time. Many dive computers supply water
+temperature information and this box may therefore contain information.
 If air temperature is not provided by the dive computer, the first temperature reading
 might be used for the air temperature. Generally this is close enough to the real air temperature as
 the change in the temperature sensor reading is quite slow to follow the changes in the environment.
 If editing is required, only a value is required, the units of temperature will be
 automatically supplied by
-<em>Subsurface</em> (according to the <em>Preferences</em>, metric or imperial units will
+<em>Subsurface</em> (following the <em>Preferences</em>, metric or imperial units will
 be used).</p></div>
-<div class="paragraph"><p><strong>Location</strong>: In this field one should type in text that describes the site
-where the dive was performed, e.g. "Tihany, Lake Balaton, Hungary".
-Auto completion of location names will
-make this easier if one frequently dives at the same sites.</p></div>
-<div class="paragraph"><p><strong>Coordinates</strong>: The geographic coordinates of the dive site should be entered
-here. These can come from three sources:</p></div>
+<div class="paragraph"><p><strong>Location</strong>:</p></div>
+<div class="admonitionblock">
+<table><tr>
+<td class="icon">
+<img src="images/icons/warning2.png" alt="Warning" />
+</td>
+<td class="content">Dive locations are managed as a <strong>separate</strong> part of the dive log.
+The dive information in the <strong>Notes</strong> and <strong>Equipment</strong> tabs can therefore not be edited at the same
+time as the dive site information. Save all the other dive information (e.g.
+divemaster, buddy, protective gear, notes about the dive) by selecting <em>Apply changes</em> on the
+<strong>Notes</strong> tab before editing the dive site information. Only then, supply a dive site name in the
+textbox labelled <em>Location</em> on the <strong>Notes</strong> tab.</td>
+</tr></table>
+</div>
+<div class="paragraph"><p>Type the name of the dive site, e.g. "Tihany, Lake Balaton, Hungary".
+If several dives are
+performed at the same location, the dive site information for the first dive is re-used.
+Existing dive location information
+can be edited at any time by selecting (on the <strong>Dive List</strong> panel) a dive performed at that site
+and by opening the location information by clicking the globe button on the
+right of the location name (see image on the right, above). When entering a dive location name, auto location of
+dive site names makes it easy to select an existing dive site name
+(i.e. when typing the name of a dive site,
+a dropdown list appears showing all sites with similar names). If the dive
+site has been used before, click on the already-existing name.
+The dive site names in the dropdown list contain either a globe symbol (indicating
+existing dive sites in the <em>Subsurface</em> database)
+or a <strong>+</strong> symbol (indicating dive site names that appear consistent with the
+current dive site name but which have not been added to the dive site database).
+Therefore, if the present
+dive site has not been used before, a message appears as follows (image <strong>A</strong> below):</p></div>
+<div class="imageblock" style="text-align:center;">
+<div class="content">
+<img src="images/Locations1_f22.jpg" alt="FIGURE:Location description panel" />
+</div>
+</div>
+<div class="paragraph"><p>Doubleclick on the new dive site name. A panel appears to enter the coordinates and
+other important information about the site (image <strong>B</strong>, above). The most important
+items are the coordinates of the site. There are three ways of specifying the coordinates:</p></div>
 <div class="olist loweralpha"><ol class="loweralpha">
 <li>
 <p>
-The user can find the coordinates on the world map in the bottom right hand
+One can find the coordinates on the world map in the bottom right hand
    part
-   of the Subsurface window. The map displays a green bar indicating "Move the map
-   and double-click to set the dive location". Double-click
-   at the appropriate place, the green bar disappears and the coordinates are
+   of the <em>Subsurface</em> window. The map displays an orange bar indicating "No location
+   data - Move the map and double-click to set the dive location". Upon a doubleclick
+   at the appropriate place, the orange bar disappears and the coordinates are
    stored.
 </p>
 </li>
 <li>
 <p>
-The user can obtain the coordinates from the <em>Subsurface</em> Companion app if
-   an Android or iPhone device with GPS was used and if the coordinates of the dive site
+The coordinates can be obtained from the <em>Subsurface</em> Companion app if the
+   user has an Android or iPhone device with GPS and if the coordinates of the dive site
    were stored using that device.
    <a href="#S_Companion">Click here for more information</a>
 </p>
@@ -1282,29 +1243,46 @@ Decimal degrees, e.g. 30.22496 , 30.821798</code></pre>
 </li>
 </ol></div>
 <div class="paragraph"><p>Southern hemisphere latitudes are given with a <strong>S</strong>, e.g. S30°, or with a
-negative value, e.g. -30.22496. Similarly, western longitudes are given with a
-<strong>W</strong>, e.g. W07°, or with a negative value, e.g. -7.34323.</p></div>
-<div class="paragraph"><p>Please note that GPS coordinates of a dive site are linked to the Location
-name - so adding coordinates to dives that do not have a location description
-will cause unexpected behaviour (Subsurface will think that all of these
+negative value, e.g. -30.22496. Similarly western longitudes are given with a
+<strong>W</strong>, e.g. W07°, or with a negative value, e.g. -7.34323. Some keyboards
+don&#8217;t have the degree sign (°). It can be replaced by a <strong>d</strong> like this: N30d W20d.
+If both a dive site name and coordinates have been provided, Save the
+dive site information by selecting the button <em>Apply changes</em> at the top of
+the panel.</p></div>
+<div class="paragraph"><p><strong>Important</strong>: GPS coordinates of a dive site are linked to the Location
+name - so <strong>saving</strong> a dive site with only coordinates and no dive site name
+causes unexpected behaviour (Subsurface will think that all of these
 dives have the same location and try to keep their GPS coordinates the
 same).</p></div>
+<div class="paragraph"><p><strong>Dive site name lookup:</strong> If coordinates have been typed into the appropriate
+text box, one can perform an automated name lookup based on the coordinates.
+This is achieved when <em>Subsurface</em> uses the Internet to find the name of the dive site
+based on the coordinates that were typed. If a name has been found, it is
+automatically inserted into the tags box. The list box
+(Titled <em>Dive sites on same coordinates</em>") at the bottom
+of the dive site panel contains the names of other dives sites used at the
+current location. For instance if the dive site is "Blue Hole" and there are several
+dive sites named "Blue Hole", all these sites are listed in this list box.</p></div>
+<div class="paragraph"><p>Enter any other textual information about the dive site (Description and Notes),
+then select <em>Apply Changes</em> to save the geolocation for this dive site. At a later stage
+the dive site information can be edited by clicking the globe icon to the right of the
+dive site name in the <strong>Notes tab</strong>.</p></div>
 <div class="paragraph"><p><strong>Dive mode</strong>: This is a dropdown box allowing one to choose the type of dive
-performed. The options are OC (Open Circuit, the default seting, meant for most recreational dives),
+performed. The options are OC (Open Circuit SCUBA, the default seting, meant for most recreational dives),
 Freedive (dive without SCUBA equipment), CCR (Closed-circuit
 rebreather) and pSCR (Passive semi-closed rebreather).</p></div>
 <div class="paragraph"><p><strong>Divemaster</strong>: The name of the dive master or dive guide for this dive should be
 entered in this field
-which offers auto completion based on the list of dive masters in
+which offers auto selection based on the list of dive masters in
 the current logbook.</p></div>
 <div class="paragraph"><p><strong>Buddy</strong>: In this field, one enters the name(s) of the buddy / buddies
 (separated with commas) who accompanied him/her on the
-dive. Auto completion based on the list of buddies in the current logbook is
+dive. Auto selection based on the list of buddies in the current logbook is
 offered.</p></div>
-<div class="paragraph"><p><strong>Suit</strong>: Here the type of diving suit used for the dive can be entered.
-Auto completion of the suit description is available.
+<div class="paragraph"><p><strong>Suit</strong>: Here the type of dive suit used can be entered.
+Auto selection of the suit description is available.
 Some dry-suit users may choose to use this field to record what combination of
-suit and thermal protection undersuit was used.</p></div>
+suit and thermal undersuit was used.</p></div>
 <div class="paragraph"><p><strong>Rating</strong>: One can provide a subjective overall rating of the dive on a
 5-point scale by clicking the appropriate star on the rating scale.</p></div>
 <div class="paragraph"><p><strong>Visibility</strong>: Similarly, one can provide a rating of visibility during the
@@ -1319,29 +1297,24 @@ will list the tags that correspond to the typing. For instance, if the user
 typed
 <code>cav</code>, then the tags <strong>cave</strong> and <strong>cavern</strong> are shown for the user to choose from.</p></div>
 <div class="paragraph"><p><strong>Notes</strong>: Any additional information for the dive can be entered here.</p></div>
-<div class="paragraph"><p>The <strong>Save</strong> and <strong>Cancel</strong> buttons are used to save all the information for tabs
-in the info panel and in the dive profile panel, so there&#8217;s no need to use them
-until ALL other information has been added. Here is an example of a completed
-Dive Notes panel:</p></div>
-<div class="imageblock" style="text-align:center;">
-<div class="content">
-<img src="images/CompletedDiveInfo_f20.jpg" alt="FIGURE: A completed Dive Notes tab" />
-</div>
+<div class="paragraph"><p>The <em>Apply changes</em> and <em>Discard changes</em> buttons are used to save all the information for tabs
+in the <strong>Info</strong> panel and in the <strong>Dive Profile</strong> panel, so there&#8217;s no need to use them
+until <strong>ALL</strong> other information has been added. The image <a href="#S_Notes_dc">at the beginning of this section</a>
+shows an example of a <strong>Notes tab</strong> after completion of the dive information.</p></div>
 </div>
-</div>
-<div class="sect3">
-<h4 id="_equipment_2">5.2.5. Equipment</h4>
+<div class="sect4">
+<h5 id="_equipment">Equipment</h5>
 <div class="paragraph"><p>The Equipment tab allows one to enter information about the type of
 cylinder and gas used as well as the weights used for the dive. The
 message in a blue box at the top of the panel:</p></div>
 <div class="imageblock" style="text-align:center;">
 <div class="content">
-<img src="images/BlueEditBar_f20.jpg" alt="FIGURE: Blue edit bar" />
+<img src="images/BlueEditBar_f22.jpg" alt="FIGURE: Blue edit bar" />
 </div>
 </div>
 <div class="paragraph"><p>indicates that the dive is being edited. This is a highly interactive part of
 <em>Subsurface</em> and the information on
-cylinders and gases (entered here) determines the behaviour of the dive profile
+cylinders and gases (entered here) determines the behaviour of the <strong>Dive profile</strong>
 (top right-hand panel).</p></div>
 <div class="paragraph" id="cylinder_definitions"><p><strong>Cylinders</strong>: The cylinder information is entered through a dialogue that looks
 like this:</p></div>
@@ -1350,14 +1323,15 @@ like this:</p></div>
 <img src="images/DC_gas-dialogue1_f20.jpg" alt="FIGURE: Initial cylinder dialogue" />
 </div>
 </div>
-<div class="paragraph"><p>In most cases <em>Subsurface</em> obtains the gas used from the dive computer and
-automatically inserts the gas composition(% oxygen) in the table. The + button
+<div class="paragraph"><p>For hand-entered dives, this information needs to be typed in. For dive computers,
+<em>Subsurface</em> often obtains the gas used from the dive computer and
+automatically inserts the gas composition(% oxygen or % helium) in the table. The + button
 at the top right allows the user to add more cylinders for this dive. The dark
 dustbin icon on the left allows the deletion of information for a cylinder.
 Note that it is not possible to delete a cylinder if it is used during the
 dive. A cylinder might be implicitly used in the dive, even without a gas change event.</p></div>
 <div class="paragraph"><p>The user should start by selecting a cylinder type on the left-hand side of the
-table.  To select a cylinder, the <strong>cylinder type</strong> box should be clicked. This
+table.  To select a cylinder, the <em>Type</em> box should be clicked. This
 brings up a list button that can be used to display a dropdown list of
 cylinders:</p></div>
 <div class="imageblock" style="text-align:center;">
@@ -1368,18 +1342,18 @@ cylinders:</p></div>
 <div class="paragraph"><p>The drop-down list can then be used to select the cylinder type that was used
 for this dive or the user may start typing in the box which shows the available
 options for the entered characters. The
-<strong>Size</strong> of the cylinder as well as its working pressure (<strong>WorkPress</strong>) will
+<strong>Size</strong> of the cylinder as well as its working pressure (<em>Work.press</em>) will
 automatically be shown in the dialogue.</p></div>
-<div class="paragraph"><p>Next one must indicate the starting pressure and the ending pressure of the
+<div class="paragraph"><p>Next, indicate the starting pressure and the ending pressure of the
 specified gas during the dive. The unit of pressure (metric/imperial)
 corresponds to the settings chosen in the <em>Preferences</em>.</p></div>
 <div class="paragraph"><p>Finally, provide the gas mixture used. If air was used, the
 value of 21%  can be entered  or this field can be left blank. If nitrox or
 trimix were used, their percentages of oxygen and/or helium should be entered.
 Any inappropriate fields should be left empty. After typing the
-information for the cylinder,
-either press <em>ENTER</em> on the keyboard or click outside the cell
-that contains
+information for the cylinder, save the data
+either by pressing <em>ENTER</em> on the keyboard or by clicking outside the cell
+containing
 the cursor. Information for any additional cylinders can be added by using the<br />
 button at the top right hand. Following is an example of a complete description
 for a dive using two cylinders (air and EAN50):</p></div>
@@ -1398,20 +1372,20 @@ this:</p></div>
 <img src="images/WeightsDataEntry1_f20.jpg" alt="FIGURE:The Weights dialogue" />
 </div>
 </div>
-<div class="paragraph"><p>By clicking on the <strong>Type</strong> field, a drop-down list becomes accessible through a
+<div class="paragraph"><p>By clicking on the <em>Type</em> field, a drop-down list becomes accessible through a
 down-arrow:</p></div>
 <div class="imageblock" style="text-align:center;">
 <div class="content">
 <img src="images/WeightsDataEntry2_f20.jpg" alt="FIGURE:Weights type drop-down list button" />
 </div>
 </div>
-<div class="paragraph"><p>The drop-down list can then be used to select the type of weight system
+<div class="paragraph"><p>This can be used to select the type of weight system
 used during the dive or the user may start typing in the box
-which shows the available options for the entered characters.
+to specify a different weighting mechanism that will be saved by <em>Subsurface</em>.
 In the <strong>Weight</strong>
 field, type in the amount of weight used during the dive. After
 specifying the weight
-system, the user can either press <em>ENTER</em> on the keyboard or click outside the
+system, save the data by either pressing <em>ENTER</em> on the keyboard or by clicking outside the
 cell with the cursor.
 It is possible to enter information for more than one weight system by adding
 an additional system
@@ -1424,19 +1398,20 @@ with two types of weights: integrated as well as a weight belt:</p></div>
 </div>
 </div>
 </div>
+</div>
 <div class="sect3">
-<h4 id="_editing_several_selected_dives_simultaneously">5.2.6. Editing several selected dives simultaneously</h4>
+<h4 id="_editing_several_selected_dives_simultaneously">5.2.5. Editing several selected dives simultaneously</h4>
 <div class="paragraph"><p><em>METHOD 1</em>: After uploading dives from
-a dive computer, the dive profiles of the uploaded dives are shown in the <strong>Dive profile</strong> tab, as well
+a dive computer, the dive profiles of each uploaded dive is shown in the <strong>Dive profile</strong> tab, as well
 as a few items of information
-in the <strong>Dive Notes</strong> tab (e.g. water temperature) and in the <strong>Equipment</strong> tab (e.g. gas pressures
+in the <strong>Notes</strong> tab (e.g. water temperature) and in the <strong>Equipment</strong> tab (e.g. gas pressures
 and gas composition). However the other fields remain empty.
 It may be useful to simultaneously edit some of the
-fields in the <strong>Dive Notes</strong> and <strong>Equipment</strong> tabs.  For instance, it is possible
+fields in the <strong>Notes</strong> and <strong>Equipment</strong> tabs.  For instance, it is possible
 that a diver performed several dives during a single day, using identical equipment while diving at the same
 dive site or with the same dive master and/or buddy or tags. Instead of completing the information for each
 of these dives separately, one can select all the dives for that day in the <strong>Dive List</strong> and
-insert the same information in the <strong>Dive Notes</strong> and <strong>Equipment</strong> fields that need
+insert the same information in the <strong>Notes</strong> and <strong>Equipment</strong> fields that need
 identical information. This is achieved by editing the dive notes or the equipment for any one
 of the selected dives.</p></div>
 <div class="paragraph"><p>The simultaneous editing only works with fields that do not already contain information.
@@ -1449,15 +1424,15 @@ edited dive is
 changed, even though several dives have been selected in the <strong>Dive List</strong>. This greatly speeds
 up the completion of the dive log after several similar dives.</p></div>
 <div class="paragraph" id="S_CopyComponents"><p><em>METHOD 2</em>:There is a different way of achieving the same goal. Select a dive with all the appropriate information
-typed into the <strong>Dive Notes</strong> and <strong>Equipment</strong> tabs. Then, from the main menu, select <em>Log &#8594;  Copy dive components</em>.
-A box is presented with a selection of check boxes for most of the fields in the <strong>Dive Notes</strong> and <strong>Equipment</strong> tabs.
+typed into the <strong>Notes</strong> and <strong>Equipment</strong> tabs. Then, from the main menu, select <em>Log &#8594;  Copy dive components</em>.
+A box is presented with a selection of check boxes for most of the fields in the <strong>Notes</strong> and <strong>Equipment</strong> tabs.
 Select the fields to be copied from the currently selected dive, then select <em>OK</em>. Now, in the <strong>Dive List</strong>,
 select the dives
 into which this information is to be pasted. Then, from the main menu, select <em>Log &#8594;  Paste dive components</em>.
 All the selected dives now contain the data initially selected in the original source dive log.</p></div>
 </div>
 <div class="sect3">
-<h4 id="_adding_bookmarks_to_a_dive">5.2.7. Adding Bookmarks to a dive</h4>
+<h4 id="_adding_bookmarks_to_a_dive">5.2.6. Adding Bookmarks to a dive</h4>
 <div class="paragraph"><p>Many divers wish to annotate their dives with text that indicate particular events
 during the dive, e.g. "Saw dolphins", or "Released surface buoy". This is easily
 done:</p></div>
@@ -1494,17 +1469,16 @@ If one hovers using the mouse over the red bookmark, the appropriate text is sho
 </div>
 </div>
 <div class="sect3">
-<h4 id="_saving_the_updated_dive_information">5.2.8. Saving the updated dive information</h4>
-<div class="paragraph"><p>The information entered in the <strong>Dive Notes</strong> tab and the <strong>Equipment</strong> tab can be
-saved by
-using the
-two buttons on the top right hand of the <strong>Dive Notes</strong> tab. If the <em>Save</em> button
+<h4 id="_saving_the_updated_dive_information">5.2.7. Saving the updated dive information</h4>
+<div class="paragraph"><p>The information entered in the <strong>Notes</strong> tab and the <strong>Equipment</strong> tab can be
+saved by using the
+two buttons on the top right hand of the <strong>Notes</strong> tab. If the <em>Apply changes</em> button
 is clicked,
-the dive data are saved. If the <em>Cancel</em> button is clicked, then the newly
-entered dive data are
-deleted, although the dive profile obtained from the dive computer will be
+the dive data are saved in the memory image of the dive. If the <em>Discard changes</em>
+button is clicked, then the newly entered dive data are
+erased from the computer memory, although the dive profile is
 retained. When the user exits <em>Subsurface</em> there is a final prompt to confirm
-that the new data should be saved.</p></div>
+that the new data should now be saved permanently on the computer disk.</p></div>
 </div>
 </div>
 <div class="sect2">
@@ -1522,7 +1496,7 @@ Currently, <em>Subsurface</em> supports importing CSV log files from several sou
 APD LogViewer, XP5, Sensus and Seabear files are
 preconfigured, but because the import is flexible, users can configure their own
 imports.
-Manually kept log files (e.g. in spreadsheet) can also be imported by
+Manually kept log files (e.g. a spreadsheet) can also be imported by
 configuring the CSV import.
 <em>Subsurface</em> can also import UDDF and UDCF files used by some divelog
 software and some dive computers, like the Heinrichs &amp; Weikamp DR5. Finally,
@@ -1538,12 +1512,13 @@ tries to detect multiple records for
 the same dive and merges the information as best as it can. If
 there are no time zone issues (or other reasons that would cause the
 beginning time of the dives to be significantly different) <em>Subsurface</em>
-will not create duplicate entries.</p></div>
+will not create duplicate entries. Below follows more specific information
+to achieve data import to <em>Subsurface</em>.</p></div>
 <div class="sect3">
 <h4 id="_using_the_universal_import_dialogue">5.3.1. Using the universal import dialogue</h4>
 <div class="paragraph" id="Unified_import"><p>Importing dives from other software is performed through a universal interface
-that is activated by selecting <em>Import</em> from the Main Menu, then clicking on
-<em>Import Log Files</em>. This brings up the dialogue <strong>A</strong> below.</p></div>
+activated by selecting <em>Import</em> from the Main Menu, then clicking on
+<em>Import Log Files</em>. This brings up dialogue <strong>A</strong>, below.</p></div>
 <div class="imageblock" style="text-align:center;">
 <div class="content">
 <img src="images/Import1_f20.jpg" alt="FIGURE: Import dialogue: step 1" />
@@ -1560,6 +1535,11 @@ XML-formatted dive logs (DivingLog 5.0, MacDive and several other dive log syste
 </li>
 <li>
 <p>
+Cochran dive logs
+</p>
+</li>
+<li>
+<p>
 UDDF-formatted dive logs (e.g. Kenozoooid)
 </p>
 </li>
@@ -1575,6 +1555,26 @@ Poseidon MkVI CCR logs
 </li>
 <li>
 <p>
+APD Inspiration/Evolution CCR logs
+</p>
+</li>
+<li>
+<p>
+LiquiVision logs
+</p>
+</li>
+<li>
+<p>
+divelog.de logs
+</p>
+</li>
+<li>
+<p>
+OSTC Tools logs
+</p>
+</li>
+<li>
+<p>
 JDiveLog
 </p>
 </li>
@@ -1589,12 +1589,30 @@ CSV (text-based and spreadsheet-based) dive logs, including APD CCR logs
 </p>
 </li>
 </ul></div>
-<div class="paragraph"><p>Selecting the appropriate file in the file list of the dialogue opens
+<div class="paragraph"><p>Selecting the appropriate format and then the specific log file in the large window
+containing the file list on the right of the dialogue opens
 the imported dive log in the <em>Subsurface</em> <strong>Dive List</strong>. Some other formats, not
 accessible through the Import dialogue are also supported, as explained below.</p></div>
 </div>
 <div class="sect3">
-<h4 id="_importing_from_mares_dive_organiser_v2_1">5.3.2. Importing from Mares Dive Organiser V2.1</h4>
+<h4 id="_importing_from_ostctools">5.3.2. Importing from  OSTCTools</h4>
+<div class="paragraph"><p><em>OSTC Tools</em> is a Microsoft-based suite of dive download and dive management tools for the OSTC
+family of dive computers. <em>OSTC Tools</em> downloads dive data from the dive computer and stores it
+as a binary file with file extension <em>.dive</em> . Subsurface can directly import these files when using
+the universal import dialogue. From the dropdown list at the bottom right select
+<em>OSTCTools Files (.dive .DIVE)</em>. This makes the <em>OSTC Tools</em> dive logs visible in the file list
+panel. Select one or more dive, then click the <em>Open</em> button. The OSTC dives are shown in the
+<strong>Dive List</strong> panel.</p></div>
+<div class="paragraph"><p>Actually, all H&amp;W devices supported by OSTCTools can be imported to <em>Subsurface</em>, this includes
+OSTC, OSTC Mk2, OSTC 2N/2C, OSTC3, OSTC Sport, and probably although untested, Frog, OSTC2 and
+OSTC CR.</p></div>
+<div class="paragraph"><p>Please, remember that OSTCTools is <strong>not</strong> a true diving log software, but a useful set of tools
+for analysis and management of OSTC devices. This way, only raw dive computer data will be
+performed with the import to <em>Subsurface</em>; one has to to manually complete the rest of
+data which may be important (buddies, equipment, notes, etc).</p></div>
+</div>
+<div class="sect3">
+<h4 id="_importing_from_mares_dive_organiser_v2_1">5.3.3. Importing from Mares Dive Organiser V2.1</h4>
 <div class="paragraph"><p>Since Mares utilise proprietary Windows software not compatible with
 multi-platform applications, these dive logs cannot be
 directly imported into
@@ -1603,7 +1621,7 @@ using <em>www.divelogs.de</em> as a mechanism to extract the dive log informatio
 <div class="olist arabic"><ol class="arabic">
 <li>
 <p>
-The dive log data from Mares Dive Organiser need to be exported to the user&#8217;s
+Export the dive log data from Mares Dive Organiser to the user&#8217;s
    desktop, using
    a <em>.sdf</em> file name extension. Refer to <a href="#Mares_Export">Appendix C</a> for more
    information.
@@ -1628,16 +1646,16 @@ Finally,  import the dives
 </ol></div>
 </div>
 <div class="sect3">
-<h4 id="S_ImportingDivelogsDe">5.3.3. Importing dives from <strong>divelogs.de</strong></h4>
+<h4 id="S_ImportingDivelogsDe">5.3.4. Importing dives from <strong>divelogs.de</strong></h4>
 <div class="paragraph"><p>The import of dive information from <em>divelogs.de</em> is simple, using a single
 dialogue box. The <em>Import &#8594;  Import from Divelogs.de</em> option should be selected
 from the Main Menu. This
-brings up a dialogue box (see figure on left [<strong>A</strong>] below). Enter a
+brings up a dialogue box (see image <strong>A</strong> below). Enter a
 user-ID and password for <em>divelogs.de</em> into the appropriate fields and then
 select
 the <em>Download</em> button. Download from <em>divelogs.de</em> starts immediately,
 displaying a progress bar in the dialogue box. At the end of the download, the
-success status is indicated (see figure on the right [<strong>B</strong>], below). The
+success status is indicated (see image <strong>B</strong>, below). The
 <em>Apply</em> button should then be selected, after which the imported dives appear in the
 <em>Subsurface</em> <strong>Dive List</strong> panel.</p></div>
 <div class="imageblock" style="text-align:center;">
@@ -1647,7 +1665,7 @@ success status is indicated (see figure on the right [<strong>B</strong>], below
 </div>
 </div>
 <div class="sect3">
-<h4 id="S_ImportingCSVData">5.3.4. Importing data in CSV format</h4>
+<h4 id="S_ImportingCSVData">5.3.5. Importing data in CSV format</h4>
 <div class="paragraph"><p>A comma-separated file (.csv) can be used to import dive information either as dive profiles
 (as in the case of the APD Inspiration and Evolution closed circuit rebreathers) or as dive
 metadata (in case the user keeps dive data in a spreadsheet). The <em>CSV</em> format is a universal
@@ -1692,10 +1710,10 @@ things about the data being imported</strong>:</p></div>
 <li>
 <p>
 Which character separates the different columns within a single line of
-   data? This field separator should be either a comma (,) or a TAB character.
+   data? This field separator should be either a comma (,) a semicolon (;) or a TAB character.
    This can be determined by opening the file with a text editor. If it is
-   comma-delimited, then the comma
-   characters between the values are clearly visible. If no commas are evident and
+   comma-delimited or semicolon-delimited, the comma or semicolon
+   characters between the values are clearly visible. If these are not evident and
    the numbers are aligned in columns,
    the file is probably TAB-delimited (i.e. it uses a TAB as a field separator).
 </p>
@@ -1709,7 +1727,7 @@ Which data columns need to be imported into <em>Subsurface</em>? Is it a <em>CSV
 </li>
 <li>
 <p>
-Is the numeric information (e.g. dive depth) in metric or in imperial unis?
+Is the numeric information (e.g. dive depth) in metric or in imperial units?
 </p>
 </li>
 </ol></div>
@@ -1734,16 +1752,14 @@ the time units (seconds, minutes or minutes:seconds), as well as the unit system
 (metric or imperial). Selecting the appropriate options among these is critical for
 the successful import of the data.</p></div>
 <div class="paragraph"><p>The last remaining task is to ensure that all the data columns have the appropriate
-column headings. The top line of the white part of the data table contains the column
-headings found in the <em>CSV</em> data file. The blue row of cells immediately above these
-contains the names understood by <em>Subsurface</em>. The white area below the dropdown
-lists contains all the field names that <em>Subsurface</em> recognises. These names are
-in blue balloons and can be moved using a drag-and-drop action. For
+column headings. The top blue row of the data table contains the column
+headings found in the <em>CSV</em> data file. The blue row of balloons immediately above these
+contains the names understood by <em>Subsurface</em>. These balloons can be moved using a drag-and-drop action. For
 instance, <em>Subsurface</em> expects the column heading for Dive number (" # ") to be "Dive # ". If
-the column heading that <em>Subsurface</em> expects is not in the blue cells, then drag the
-appropriate column heading from the upper area and drop it in the appropriate blue
+the column heading that <em>Subsurface</em> expects is not in the blue row, then drag the
+appropriate balloon from the upper area and drop it in the appropriate blue
 cell at the top of the table. To indicate the correct column for "Dive #", drag
-the ballooned item labeled "Dive # " and drop it in the blue
+the ballooned item labelled "Dive # " and drop it in the blue
 cell immediately above the white cell containing " # ". This is depicted in
 the image below.</p></div>
 <div class="imageblock" style="text-align:center;">
@@ -1753,7 +1769,7 @@ the image below.</p></div>
 </div>
 <div class="paragraph"><p>Continue in this way to ensure that all the column headings in the blue row of
 cells correspond to the headings listed in the top part of the dialogue. Having
-completed this task, select the <em>OK</em> button to the bottom right og the dialogue.
+completed this task, select the <em>OK</em> button to the bottom right of the dialogue.
 The data from the <em>CSV</em> file are imported and shown in the <strong>Dive List</strong> panel.</p></div>
 <div class="sidebarblock" id="S_CSV_Intro">
 <div class="content">
@@ -1792,7 +1808,7 @@ Key Largo,2012-11-24,09:12,34:15,20.4,Jason McDonald
 Wismar Baltic,2012-12-01,10:13,35:27,15.4,Dieter Albrecht
 Pulau Weh,2012-12-20,09:46,55:56,38.6,Karaeng Bontonompo</code></pre>
 </div></div>
-<div class="paragraph"><p>In this format the data are not easily read by a human. Here is the same information in TAB-delimited format:</p></div>
+<div class="paragraph"><p>The above data are not easily read by a human. Here is the same information in TAB-delimited format:</p></div>
 <div class="literalblock">
 <div class="content">
 <pre><code>Dive site       Dive date       Time    Dive_duration   Dive_depth      Dive buddy
@@ -1838,7 +1854,7 @@ of the numbers or text within a cell. The
 file should use UTF-8 character set, if using non-ASCII characters. Also the
 size of the <em>CSV</em> file might cause problems. Importing 100 dives at a time
 (<em>CSV dive details</em>) works, but larger files might exceed
-limits of the parser used. When encountering problems with <em>CSV</em> imports, first try with
+the limits of the parser used. When encountering problems with <em>CSV</em> imports, first try with
 a smaller file to make sure everything works.</td>
 </tr></table>
 </div>
@@ -1847,12 +1863,12 @@ a smaller file to make sure everything works.</td>
 </div>
 <div class="sect2">
 <h3 id="S_Companion">5.4. Importing GPS coordinates with the <em>Subsurface Companion App</em> for mobile phones</h3>
-<div class="paragraph"><p>Using the <strong>Subsurface Companion App</strong> on an <em>Android device</em> with a GPS or
-<a href="#S_iphone"><em>iPhone</em></a>, the coordinates
+<div class="paragraph"><p>Using the <strong>Subsurface Companion App</strong> on an <em>Android device</em>   or
+<a href="#S_iphone"><em>iPhone</em></a> with GPS, the coordinates
 for the diving
 location can be automatically passed to the <em>Subsurface</em>
 dive log. The Companion App stores the dive locations on
-a dedicated Internet-based file server. <em>Subsurface</em>, in turn, can collect
+a dedicated Internet file server. <em>Subsurface</em>, in turn, can collect
 the localities from the file server.</p></div>
 <div class="paragraph"><p>To do this:</p></div>
 <div class="sect3">
@@ -1978,7 +1994,7 @@ panel opens (see <strong>C</strong> below) where the dive description or other d
 <img src="images/Companion_4.jpg" alt="FIGURE: Companion App, add location using map" />
 </div>
 </div>
-<div class="paragraph"><p>When one clicks on a dive (<strong>not</strong> selecting the check box), the
+<div class="paragraph"><p>When one selects a dive (<strong>not</strong> selecting the check box), the
 name given to it, date/time and GPS coordinates will be shown, with two options at the top
 of the screen:</p></div>
 <div class="ulist"><ul>
@@ -2020,7 +2036,7 @@ it deletes the selected dive location(s).</td>
 downloaded to a <em>Subsurface</em> dive log (see below).</p></div>
 </div>
 <div class="sect4">
-<h5 id="_settings_on_the_companion_app">Settings on the Companion app</h5>
+<h5 id="_settings_on_the_companion_app">Settings on the Companion App</h5>
 <div class="paragraph"><p>Selecting the <em>Settings</em> menu option results in the right hand image above (<strong>B</strong>).</p></div>
 </div>
 <div class="sect4">
@@ -2045,7 +2061,7 @@ downloaded to a <em>Subsurface</em> dive log (see below).</p></div>
 <div class="ulist"><ul>
 <li>
 <p>
-<em>Synchronize on startup.</em> If selected, dive locations in the Android device and those
+<em>Synchronize on startup</em>. If selected, dive locations in the Android device and those
   on the web service synchronise each time the app is started.
 </p>
 </li>
@@ -2087,7 +2103,7 @@ in the background of their Android device, allowing the continuous collection of
 </td>
 <td class="content"><em>How does the background service work?</em> Assuming the user sets 5 minutes and 50
 meters in the settings above, the app will start by recording a location at the current
-location, followed by another one at every 5 minutes <strong>or</strong> every time one moves 50m
+location, followed by another one at every 5 minutes <strong>or</strong> every time one moves 50 m
 from previous location.
 If subsequent locations are within a radius of 50 meters from the previous one,
 a new location is not saved. If the user is not moving, only one location is saved,
@@ -2156,7 +2172,7 @@ bar to end the location service. While the location
 service is running one can only add dives using the manual mechanism.</p></div>
 <div class="paragraph"><p>One can edit the site name afterwards by selecting the dive
 from the dive list and clicking on the site name. There are no other
-editable fields. The dive list is automatically uploaded from the iphone
+editable fields. The dive list is automatically uploaded from the iPhone
 to the webservice and there is not an option to
 trigger upload manually.</p></div>
 </div>
@@ -2244,17 +2260,23 @@ to be loaded into <em>Subsurface</em> and click the <em>Open</em> button.</p></d
 <img src="images/LoadImage2_f20.jpg" alt="FIGURE: Load images option" />
 </div>
 </div>
-<div class="paragraph"><p>This brings one to the time synchronisation dialog, shown below. The
+<div class="paragraph"><p>This brings up the time synchronisation dialog, shown below. The
 critical problem is that the time
 synchronisation is not perfect between the dive computer used during a dive,
 and the camera used during that same dive. These two devices
 often differ by several minutes. If <em>Subsurface</em> can achieve synchronisation,
 then the exact times of photographs can be used to position photographs on
 the dive profile.</p></div>
-<div class="paragraph"><p><em>Subsurface</em> achieves this synchronisation in two ways:</p></div>
+<div class="paragraph"><p><em>Subsurface</em> achieves this synchronisation in three ways:</p></div>
 <div class="ulist"><ul>
 <li>
 <p>
+<strong>Pro-actively</strong>: Before the dive, ensure synchronisation of the dive computer time settings with
+  the time settings of the camera by changing the date-time settings on one or both of these devices.
+</p>
+</li>
+<li>
+<p>
 <strong>Manually</strong>: If the user wrote down the exact camera time at the start of a dive, the
   difference in time between the two devices can be determined. Actually, as long as the device
   settings for time has not been changed in either device, one could write down the times of
@@ -2280,47 +2302,48 @@ the dive profile.</p></div>
 <strong>By photograph</strong>: There is a very slick way of achieving synchronisation. If one takes a
   photograph of the face of the dive computer showing the time, then <em>Subsurface</em> can obtain
   the exact time the photograph was taken, using the metadata that the camera stores within
-  each photo. In order to do this, use the bottom half of the Time shift_ dialog. If one uses
+  each photo. In order to do this, use the bottom half of the <em>Time shift</em> dialog. If one uses
   the bottom part, the top part of the dialog is ignored. Click on
-  the horizontal bar entitled "<em>Select image of divecomputer showing time</em>. This brings up
-  a file browser with which one can select the photograph of the dive computer. Select the
+  the horizontal bar entitled "<em>Select image of dive computer showing time</em>. This brings up
+  a file browser with which one can select the photograph of the dive computer time. Select the
   photograph using the file browser and click on <em>OK</em>. This photograph of the dive computer
   appears in the bottom panel of the <em>Shift times</em> dialog. Now <em>Subsurface</em> knows exactly
   when the photograph has been taken. Now set the date-time dialog to the left of the photo
   so that this tool reflects the date and time of the dive computer in the photo. When the
   date-time tool has been set, <em>Subsurface</em> knows exactly what the time difference between
-  camera and dive computer is, and synchronisation is achieved. There is a
-  photograph with the face of the dive computer and with the date-time tool set to the
-  date-time on image <strong>B</strong> above.
+  camera and dive computer is, and synchronisation is achieved.
+  Image <strong>B</strong> above shows a photograph of the face of the dive computer and with the date-time tool set to the
+  date-time.
 </p>
 </li>
 </ul></div>
-<div class="paragraph"><p>If the timestamp of a photograph is long before or after the dive, it is not placed on
-the dive profile. If the timestamp of the photo is within 30 minutes of the dive, it is shown.</p></div>
+<div class="paragraph"><p>If the timestamp of a photograph is more than 30 minutes before or after the dive, it is not placed on
+the dive profile.</p></div>
 </div>
 <div class="sect3">
 <h4 id="_viewing_the_photos">5.5.2. Viewing the photos</h4>
-<div class="paragraph"><p>In order to view the photos added to a dive, activate the <em>show-photos</em> button in the tool bar
-to the left of the dive profile:</p></div>
-<div class="imageblock" style="text-align:left;">
-<div class="content">
-<img src="images/icons/ShowPhotos_f20.png" alt="FIGURE:Show photos toolbar button" />
-</div>
-</div>
 <div class="paragraph"><p>After the images have been loaded, they appear in two places:</p></div>
 <div class="ulist"><ul>
 <li>
 <p>
-the <em>Photos</em> tab of the <strong>Dive Notes</strong> panel.
+the <em>Photos</em> tab of the <strong>Notes</strong> panel.
 </p>
 </li>
 <li>
 <p>
 as tiny icons (stubs) on the dive profile at the appropriate positions reflecting the time
-   each photograph was taken. See below:
+   each photograph was taken.
+   In order to view the photos on the dive profile, activate the <em>show-photos</em> button in the tool bar
+   to the left of the dive profile:
 </p>
 </li>
 </ul></div>
+<div class="imageblock" style="text-align:left;">
+<div class="content">
+<img src="images/icons/ShowPhotos_f20.png" alt="FIGURE:Show photos toolbar button" />
+</div>
+</div>
+<div class="paragraph"><p>This results in a profile display as in the image below:</p></div>
 <div class="imageblock" style="text-align:center;">
 <div class="content">
 <img src="images/LoadImage4_f20.jpg" alt="FIGURE: Photos on dive profile" />
@@ -2348,7 +2371,7 @@ can also be deleted using the <em>Photos</em> tab (see text below).</p></div>
 </div>
 <div class="sect3">
 <h4 id="_the_em_photos_em_tab">5.5.3. The <em>Photos</em> tab</h4>
-<div class="paragraph"><p>Photographs associated with a dive are shown as thumbnails in the <em>Photos</em> tab of the <em>Dive Notes</em>
+<div class="paragraph"><p>Photographs associated with a dive are shown as thumbnails in the <em>Photos</em> tab of the <em>Notes</em>
 panel. Photos taken in rapid succession during a dive (therefore sometimes with large
 overlap on the dive profile) can easily be accessed in the <em>Photos</em> tab. This tab serves as
 a tool for individually accessing the photos of a dive, while the stubs on the dive profile
@@ -2360,7 +2383,7 @@ from the <em>Photos</em> tab as well as the dive profile.</p></div>
 </div>
 <div class="sect3">
 <h4 id="_photos_on_an_external_hard_disk">5.5.4. Photos on an external hard disk</h4>
-<div class="paragraph"><p>Most underwater photographers store their photos on an external drive. If such a drive can be mapped
+<div class="paragraph"><p>Most underwater photographers store their photos on an external drive. If such a drive can be mapped by the operating system
 (almost always the case) the photos can be directly accessed by <em>Subsurface</em>. This facilitates the interaction
 between <em>Subsurface</em> and an external repository of photos. When associating a dive profile with photos from an
 external drive, the normal procedure of selection and synchronisation (see text above) is used.
@@ -2370,21 +2393,76 @@ program only shows a small white dot where each photo should be on the dive prof
 In addition the <em>Photos</em> tab only shows the file names of the photos. This is normal behaviour.
 If, later, the external drive with the photos is connected again, the photos can be seen in the normal way.</p></div>
 </div>
+<div class="sect3">
+<h4 id="S_FindMovedImages">5.5.5. Moving photographs among directories, hard disks or computers</h4>
+<div class="paragraph"><p>After a photograph has been loaded into <em>Subsurface</em> and associated with a specific dive, the directory
+ where the photo lies is stored, allowing <em>Subsurface</em> to find the photograph when the dive is
+ opened again. If the photo or the whole photo collection is moved to another drive or to a different
+ machine, it is unlikely that the directory structure will remain identical to that of the original uploaded
+ photo. When this happens, <em>Subsurface</em> looks for the photos at their original location before they were moved,
+ cannot find them and therefore cannot display them. Because, after moving photos, large numbers of photos
+ may need to be deleted and re-imported from the new location, <em>Subsurface</em> has a mechanism that eases the
+ process of updating the directory information for each photo: automatic updates using fingerprints.</p></div>
+<div class="paragraph"><p>When a photo is loaded into <em>Subsurface</em>, a fingerprint for the image is calculated and stored with the
+ other reference information for that photo. After moving a photo collection (that has already been loaded
+ into <em>Subsurface</em>) to a different directory, disk or computer, <em>Subsurface</em> can  perform the
+ following steps:</p></div>
+<div class="ulist"><ul>
+<li>
+<p>
+look through a particular directory (and all its subdirectories recursively) where photos have been moved
+ to,
+</p>
+</li>
+<li>
+<p>
+calculate fingerprints for all photos in this directory, and
+</p>
+</li>
+<li>
+<p>
+if there is a match between a calculated fingerprint and the one originally calculated when a photo was
+ loaded into <em>Subsurface</em> (even if the original file name has changed), to automatically update the
+ directory information so that <em>Subsurface</em> can find the photo in the new moved directory.
+</p>
+</li>
+</ul></div>
+<div class="paragraph"><p>This is achieved by selecting from the Main Menu: <em>File &#8594;      Find moved images</em>. This brings up a window within
+ which the NEW directory of the photos needs to be specified. Select the appropriate directory and click
+ the <em>Scan</em> button towards the bottom right of the panel. The process may require several minutes to
+ complete, after which <em>Subsurface</em> will show the appropriate photographs when a particular dive is opened.</p></div>
+<div class="sidebarblock" id="Image_fingerprint_upgrade">
+<div class="content">
+<div class="paragraph"><p><strong>Upgrading existing photo collections without fingerprints</strong></p></div>
+<div class="admonitionblock">
+<table><tr>
+<td class="icon">
+<img src="images/icons/important.png" alt="Important" />
+</td>
+<td class="content"><em>Subsurface</em> automatically calculates fingerprints for all images that can be accessed by <em>Subsurface</em>.
+When manipulating images, ensure that all the images associated with the dive log can be accessed by <em>Subsurface</em>.</td>
+</tr></table>
+</div>
+<div class="paragraph"><p><em>Subsurface</em> automatically checks and, if necessary, updates the fingerprints associated with a single dive if:
+- The images associated with that dive are visible as thumbnails on the <strong>Dive Profile</strong>.
+- One edits anything in the <strong>Notes tab</strong> panel and save the edits by selecting <em>Apply changes</em>.</p></div>
+</div></div>
+</div>
 </div>
 <div class="sect2">
 <h3 id="_logging_special_types_of_dives">5.6. Logging special types of dives</h3>
 <div class="sect3">
 <h4 id="S_MulticylinderDives">5.6.1. Multicylinder dives</h4>
-<div class="paragraph"><p><em>Subsurface</em> easily handles dives involving more than one cylinder. Multicylinder diving usually happens
+<div class="paragraph"><p><em>Subsurface</em> easily handles dives involving more than one cylinder. Multi-cylinder diving usually happens
 (a) if a diver does not have enough gas for the complete dive in a single cylinder; (b) if the diver
 needs more than one gas mixture because of the depth or the decompression needs of the dive. For this reason
-multicylinder dives are often used by technical divers who dive deep or long. As far
+multi-cylinder dives are often used by technical divers who dive deep or long. As far
 as <em>Subsurface</em> is concerned, there are only two types of information that need to be provided:</p></div>
 <div class="ulist"><ul>
 <li>
 <p>
 <strong>Describe the cylinders used during the dive</strong> This is performed in the <strong>Equipment tab</strong> of
-  the <strong>Dive Info</strong> panel, as <a href="#cylinder_definitions">described above</a>. Enter the cylinders one by one,
+  the <strong>Info</strong> panel, as <a href="#cylinder_definitions">described above</a>. Enter the cylinders one by one,
   specifying the characteristics of the cylinder and the gas composition within each cylinder.
 </p>
 </li>
@@ -2419,27 +2497,27 @@ to perform decompression.</p></div>
 </div>
 <div class="sect3">
 <h4 id="_sidemount_dives">5.6.2. Sidemount dives</h4>
-<div class="paragraph"><p>Sidemount diving is just another form of multicylinder diving, often with both or all cylinders having
+<div class="paragraph"><p>Sidemount diving is just another form of multi-cylinder diving, often with both or all cylinders having
 the same gas mixture. Although it is a popular configuration for cave divers, sidemount
 diving can be performed by recreational divers who have completed the appropriate training. Sidemount
-dive logging involves, exactly as with multicylinder dives, above, three steps:</p></div>
+dive logging involves, exactly as with multi-cylinder dives, above, three steps:</p></div>
 <div class="ulist"><ul>
 <li>
 <p>
 <strong>During the dive, record cylinder switch events</strong>. Since sidemount diving normally involves two
   cylinders with air or with the same gas mixture, <em>Subsurface</em> distinguishes among these different
-  cylinders. In contrast, most dive computers that allow gas switching only distinguish among different
+  cylinders. In contrast, many dive computers that allow gas switching only distinguish among different
   <em>gases</em> used, not among different <em>cylinders</em> used. This means that when sidemount dives are downloaded
   from these dive computers, the events of switching between cylinders with the same gas are not downloaded. This may mean
   that one may have to keep a written log of cylinder switch times using a slate, or (if the dive computer
   has this facility) marking each cylinder switch with a bookmark that can be retrieved later. Returning
-  from a dive with the information about cylinder changes is the only tricky part of logging sidemount dives.
+  from a dive with the times of cylinder changes is the only tricky part of logging sidemount dives.
 </p>
 </li>
 <li>
 <p>
 <strong>Within <em>Subsurface</em> describe the cylinders used during the dive</strong>. The diver needs to provide the
-  specifications of the different cylinders, using the <strong>Equipment</strong> tab of the <strong>Dive Info Panel</strong> (see
+  specifications of the different cylinders, using the <strong>Equipment</strong> tab of the <strong>Info Panel</strong> (see
   image below where two 12 litre cylinder were used).
 </p>
 </li>
@@ -2486,7 +2564,7 @@ breathing gas is released continuously from the back cylinder.</td>
 <div class="ulist"><ul>
 <li>
 <p>
-Select pSCR in the <em>Dive Mode</em> dropdown list on the <strong>Dive Info</strong> panel.
+Select pSCR in the <em>Dive Mode</em> dropdown list on the <strong>Info</strong> panel.
 </p>
 </li>
 <li>
@@ -2519,14 +2597,14 @@ gas that has been breathed while doing two things to maintain a
 breathable oxygen concentration:
 a) remove carbon dioxide from the gas that has been exhaled
 b) regulate the oxygen concentration to remain within safe diving limits.
-Currently, within <em>Subsurface</em>, the Poseidon MkVI Discovery is the best
-supported CCR dive computer. The CCR interface of <em>Subsurface</em> is currently experimental
-and under active development. In contrast to a conventional recreational
+The CCR interface of <em>Subsurface</em> is currently experimental
+and under active development. Subsurface currently supports Poseidon MkVI
+and APD Discovery/Evolution dive computers. In contrast to a conventional recreational
 dive computer, a CCR system computer does not allow the download of a log
 containing multiple dives. Rather, each dive is stored independently. This
 means that <em>Subsurface</em> cannot download a dive log directly from a CCR
 dive computer, but that it imports CCR dive logs in the same way that it
-imports dive log data from other digital databases.</td>
+imports dive log data from other digital databases: one dive at a time.</td>
 </tr></table>
 </div>
 <div class="sect4">
@@ -2535,13 +2613,14 @@ imports dive log data from other digital databases.</td>
 digital sources</a>. From the main menu of <em>Subsurface</em>, select <em>Import &#8594;  Import
 log files</em> to bring up the <a href="#Unified_import">universal import dialogue</a>. As
 explained in that section, the bottom right
-hand of the import dialogue contains a dropdown list of appropriate devices
-that currently includes an option for (Poseidon) MkVI files (import for other
-CCR equipment is under active development). Having selected  the appropriate CCR format and
+hand of the import dialogue contains a dropdown list (labled <em>Filter:</em>) of appropriate devices
+that currently includes(Poseidon) MkVI or APD log viewer files (import for other
+CCR equipment is under active development). Having selected the appropriate CCR format and
 the directory where the original dive logs have been stored from the CCR dive
 computer, one can select a particular dive log file (in the case of the MkVI
 it is a file with a .txt extension). After selecting the appropriate dive log,
-activate the <em>Open</em> button at the bottom right hand of the universal import dialogue.</p></div>
+activate the <em>Open</em> button at the bottom right hand of the universal import dialogue.
+The selected dive is imported to the <em>Subsurface</em> dive list.</p></div>
 </div>
 <div class="sect4">
 <h5 id="_displayed_information_for_a_ccr_dive">Displayed information for a CCR dive</h5>
@@ -2568,7 +2647,7 @@ For THREE-sensor systems (e.g. APD), the mean value is also used. However
 </li>
 <li>
 <p>
-If no sensor data is available, the pO<sub>2</sub> value is assumed to be equal to the setpoint.
+If no sensor data are available, the pO<sub>2</sub> value is assumed to be equal to the setpoint.
 </p>
 </li>
 </ul></div>
@@ -2577,7 +2656,7 @@ If no sensor data is available, the pO<sub>2</sub> value is assumed to be equal
 oxygen sensors can be shown. The display of additional CCR information is turned on by
 checking the appropriate checkboxes in the <em>Preferences</em> panel (accessible by
 selecting <a href="#S_CCR_options"><em>File &#8594;  Preferences &#8594;  Graph</em></a>). This part of
-the <em>Preferences</em> panel look like this, representing two checkboxes that modify
+the <em>Preferences</em> panel is shown in the image below, representing two checkboxes that modify
 the display of pO<sub>2</sub> when the appropriate toolbar button on the Dive Profile
 has been activated.</p></div>
 <div class="imageblock" style="text-align:center;">
@@ -2585,11 +2664,11 @@ has been activated.</p></div>
 <img src="images/CCR_preferences_f20.jpg" alt="FIGURE: CCR preferences panel" />
 </div>
 </div>
-<div class="paragraph"><p>Checking any of the check boxes allows the display of additional oxygen-related
+<div class="paragraph"><p>Checking any of these check boxes allows the display of additional oxygen-related
 information whenever the pO<sub>2</sub> toolbar button on the <em>Profile</em> panel is activated.
 The first checkbox allows the display of setpoint information. This is a red line
 superimposed on the green oxygen partial pressure graph and allows a comparison of the
-mean measured oxygen partial pressure and the setpoint values, as in the image below.</p></div>
+mean measured oxygen partial pressure and the setpoint values, as shown below.</p></div>
 <div class="imageblock" style="text-align:center;">
 <div class="content">
 <img src="images/CCR_setpoint_f20.jpg" alt="FIGURE: CCR setpoint and po2 graph" />
@@ -2637,14 +2716,32 @@ of setpoint and oxygen sensor data, as well as the cylinder pressure data. In th
 case there is good agreement from the readings of the two oxygen sensors.</p></div>
 <div class="imageblock" style="text-align:center;">
 <div class="content">
-<img src="images/CCR_dive_profile_f20.jpg" alt="FIGURE: CCR dive profile" />
+<img src="images/CCR_dive_profile_f22.jpg" alt="FIGURE: CCR dive profile" />
 </div>
 </div>
 <div class="paragraph"><p><em>Equipment-specific information</em>: Equipment-specific information gathered by
 <em>Subsurface</em> is shown in the <a href="#S_ExtraDataTab">Extra data tab</a>. This may include setup information
 or metadata about the dive.</p></div>
+<div class="paragraph"><p>The deco ceiling calculated by Subsurface is not very accurate because the precise pressure of nitrogen
+in the loop can usually not be determined from the dive log imported from the CCR equipment. Many CCR dive
+computers, however, report an internally-calculated deco ceiling that is reported in the dive log,
+reflecting a more accurate assessment. The display of this ceiling is activated
+by clicking the appropriate button to the left of the dive profile:</p></div>
+<div class="imageblock">
+<div class="content">
+<img src="images/icons/cceiling.jpg" alt="DC ceiling icon" />
+</div>
+</div>
+<div class="paragraph"><p>The default colour of the computer-generated deco ceiling is white. However, this can be set to red
+by checking the appropriate check box after selecting <em>File  &#8594;  Preferences  &#8594;  Graph</em>.
+Below is a dive profile indicating the dive computer-generated deco ceiling:</p></div>
+<div class="imageblock" style="text-align:center;">
+<div class="content">
+<img src="images/CCR_dive_ceilingF22.jpg" alt="FIGURE: CCR computer-generated deco ceiling" />
+</div>
+</div>
 <div class="paragraph"><p>More equipment-specific information for downloading CCR dive logs for
-Poseidon MkVI and APD equipment can be found in <a href="#S_PoseidonMkVI">Appendix B</a>.</p></div>
+Poseidon MkVI and APD equipment can be found in <a href="#_appendix_b_dive_computer_specific_information_for_importing_dive_information">Appendix B</a>.</p></div>
 </div>
 </div>
 </div>
@@ -2654,8 +2751,8 @@ Poseidon MkVI and APD equipment can be found in <a href="#S_PoseidonMkVI">Append
 <h2 id="_obtaining_more_information_about_dives_entered_into_the_logbook">6. Obtaining more information about dives entered into the logbook</h2>
 <div class="sectionbody">
 <div class="sect2">
-<h3 id="_the_strong_dive_info_strong_tab_for_individual_dives">6.1. The <strong>Dive Info</strong> tab (for individual dives)</h3>
-<div class="paragraph"><p>The Dive Info tab gives some summary information about a particular dive that
+<h3 id="_the_strong_info_strong_tab_for_individual_dives">6.1. The <strong>Info</strong> tab (for individual dives)</h3>
+<div class="paragraph"><p>The Info tab gives some summary information about a particular dive that
 has been selected in the <strong>Dive List</strong>. Useful information here includes the
 surface interval before the dive, the maximum and mean depths of the dive, the
 gas volume consumed, the surface air consumption (SAC) and the number of oxygen
@@ -2772,7 +2869,7 @@ frequently increases the size of the dive profile to fill the area of the panel
 <div class="paragraph"><p><strong>Water temperature</strong> is displayed with its own blue line with temperature values
 placed adjacent to significant changes.</p></div>
 <div class="paragraph"><p>The dive profile can include graphs of the <strong>partial pressures</strong>
-of O2, N2, and He during the dive (see figure above) as well as a calculated and dive computer
+of O<sub>2</sub>, N<sub>2</sub>, and He during the dive (see figure above) as well as a calculated and dive computer
 reported deco ceilings (only visible for deep, long, or repetitive dives).
 Partial pressures of oxygen are indicated in green, those of nitrogen in black,
 and those of helium in dark red. These
@@ -2959,7 +3056,7 @@ The black line, graphed above the ambient pressure, is the maximum allowable tis
 from the gradient factors specified in the <strong>Preferences</strong>. For
 divers involved in planned decompression diving, efficient rates of offgasing are obtained with tissue pressures
 between the ambient inert gas pressure (grey line) and the pressure limit (black line). This display is a representation
-of the tissue pressures during the whole dive. In contast, the <a href="#S_gas_pressure_graph">Gas Pressure Graph</a> in the <strong>Information Box</strong> on the <strong>Dive Profile</strong>
+of the tissue pressures during the whole dive. In contrast, the <a href="#S_gas_pressure_graph">Gas Pressure Graph</a> in the <strong>Information Box</strong> on the <strong>Dive Profile</strong>
 is an instantaneous reflection of tissue pressures at the moment in time reflected by the position of the cursor on the dive profile.</td>
 </tr></table>
 </div>
@@ -2996,7 +3093,7 @@ imported from a Dive Computer. Markers are placed against the depth profile line
 and with the time of the event set by where the mouse cursor was when the right
 mouse button was initially clicked to bring up the menu. Gas Change events
 involve a selection of which gas is being switched to, the list of choices being based on
-the available gases defined in the Equipment Tab. Set-point change
+the available gases defined in the <strong>Equipment</strong> Tab. Set-point change
 events open a dialog allowing to choose the next set-point value. As
 in the planner, a set-point value of zero indicates the diver is
 breathing from an open circuit system while any non-zero value
@@ -3046,7 +3143,9 @@ buttons on the left of the profile panel. These are:</p></div>
 <td class="content">Clicking this button causes the Information Box to display the <strong>Maximum Operating Depth
 (MOD)</strong> of the dive, given the
 gas mixture used. MOD is dependent on the oxygen concentration in the breathing gas.
-For air (21% oxygen) it is around 57 m. Below the MOD there is a markedly increased
+For air (21% oxygen) it is around 57 m if a maximum pO<sub>2</sub> of 1.4 is specified in the <strong>Preferences</strong> section
+(select <em>File</em> &#8594; Preferences &#8594; Graph_ and edit the text box <em>Max pO<sub>2</sub> when showing MOD</em>.
+Below the MOD there is a markedly increased
 risk of exposure to the dangers associated with oxygen toxicity.</td>
 </tr></table>
 </div>
@@ -3091,11 +3190,11 @@ values are dependent on the composition of the breathing gas.  The EAD
 is the depth of a hypothetical air dive that has the same partial
 pressure of nitrogen as the current depth of the nitrox dive at
 hand. A nitrox dive leads to the same decompression obligation as an
-air dive to the depth equaling the EAD. The END is the depth of a
+air dive to the depth equalling the EAD. The END is the depth of a
 hypothetical air dive that has the same sum of partial pressures of
 the narcotic gases nitrogen and oxygen as the current trimix dive. A
 trimix diver can expect the same narcotic effect as a diver breathing
-air diving at a depth equaling the END.</td>
+air diving at a depth equalling the END.</td>
 </tr></table>
 </div>
 <div class="paragraph"><p>Figure (<strong>B</strong>) above shows an information box with a nearly complete set of data.</p></div>
@@ -3139,8 +3238,8 @@ The dark green area at the bottom of the graph represents the pressures of inert
 <li>
 <p>
 The top black horizontal line indicates the gradient factor that applies to the depth of
-  the diver at the particular point on the <strong>Dive Profile</strong>. The appropriate gradient factor is an
-  interpolation between the FGLow and GFHigh values specified in the Graph tab of the <strong>Preferences
+  the diver at the particular point on the <strong>Dive Profile</strong>. The gradient factor shown is an
+  interpolation between the GFLow and GFHigh values specified in the Graph tab of the <strong>Preferences
   Panel</strong> of <strong>Subsurface</strong>.
 </p>
 </li>
@@ -3202,9 +3301,8 @@ Graph <strong>E</strong> indicates the situation after remaining at 4.5 meters f
 <div class="sectionbody">
 <div class="sect2">
 <h3 id="_the_dive_list_context_menu">7.1. The Dive List context menu</h3>
-<div class="paragraph"><p>Many actions within <em>Subsurface</em> are dependent on a context menu used
-mostly to manipulate  groups of dives. The context menu is found by selecting
-a dive or a group of dives and then right-clicking.</p></div>
+<div class="paragraph"><p>Several actions on either a single dive or a group of dives can be performed using the Dive List
+Context Menu, found by selecting either a single dive or a group of dives and then right-clicking.</p></div>
 <div class="imageblock" style="text-align:center;">
 <div class="content">
 <img src="images/ContextMenu.jpg" alt="Figure: Context Menu" />
@@ -3212,7 +3310,7 @@ a dive or a group of dives and then right-clicking.</p></div>
 </div>
 <div class="paragraph"><p>The context menu is used in many manipulations described below.</p></div>
 <div class="sect3">
-<h4 id="_customising_the_information_showed_in_the_strong_dive_list_strong_panel">7.1.1. Customising the information showed in the <strong>Dive List</strong> panel</h4>
+<h4 id="_customising_the_columns_showed_in_the_strong_dive_list_strong_panel">7.1.1. Customising the columns showed in the <strong>Dive List</strong> panel</h4>
 <div class="imageblock" style="text-align:center;">
 <div class="content">
 <img src="images/DiveListOptions.jpg" alt="Example: Dive list info options" />
@@ -3222,15 +3320,8 @@ a dive or a group of dives and then right-clicking.</p></div>
 Dive_duration and Dive_location. This information can be controlled and changed by right-clicking on the
 header bar of the <strong>Dive List</strong>. For instance, a right-click on the <em>Date</em> header brings up a list of items
 that can be shown in the dive list (see above). Select an item to be shown in the <strong>Dive List</strong> or to be
-deleted from the dive list, and the list is immediately updated accordingly. Preferences for information
-shown in the <strong>Dive List</strong> is saved and used when <em>Subsurface</em> is re-opened.</p></div>
-</div>
-<div class="sect3">
-<h4 id="_selecting_dives_from_a_particular_dive_site">7.1.2. Selecting dives from a particular dive site</h4>
-<div class="paragraph"><p>Many divers have long dive lists and it may be difficult to locate all the dives at a particular site.
-By pressing <em>Ctl-F</em> on the keyboard, a text box is opened at the top left hand of the <strong>Dive List</strong>.
-Type the name of a dive site in this text box and the <strong>Dive List</strong> is immediately filtered to
-show only the dives for that site.</p></div>
+deleted from the dive list (reflected by the check symbols) and the list is immediately updated. Preferences for information
+shown in the <strong>Dive List</strong> are saved and used when <em>Subsurface</em> is re-opened.</p></div>
 </div>
 </div>
 <div class="sect2">
@@ -3245,12 +3336,16 @@ This is performed by selecting (from the Main Menu) <em>Log &#8594;  Renumber</e
 given a choice with respect to the lowest sequence number to be used.
 Completing this operation results in new sequence numbers (based on date/time)
 for the dives in the <strong>Dive List</strong> panel.</p></div>
+<div class="paragraph"><p>One can also renumber a few selected dives in the dive list. Select the dives that
+need renumbering. Right-click on the selected list and use the Dive List Context Menu
+to perform the renumbering. A popup window appears requiring the user to specify
+the starting number for the renumbering process.</p></div>
 </div>
 <div class="sect2">
 <h3 id="S_Group">7.3. Grouping dives into trips and manipulating trips</h3>
 <div class="paragraph"><p>For regular divers, the dive list can rapidly become very long. <em>Subsurface</em>
 can group dives into <em>trips</em>. It performs this by grouping dives that have
-date/times that are not separated in time by more than two days, thus creating
+date/times not separated in time by more than two days, thus creating
 a single heading for each diving trip represented in the dive log. Below is an
 ungrouped dive list (<strong>A</strong>, on the left) as well as the corresponding grouped dive
 list comprising five dive trips (<strong>B</strong>, on the right):</p></div>
@@ -3261,20 +3356,20 @@ list comprising five dive trips (<strong>B</strong>, on the right):</p></div>
 </div>
 <div class="paragraph"><p>Grouping into trips allows a rapid way of accessing individual dives without
 having to scan a long lists of dives. In order to group the dives in a dive list,
-(from the Main Menu) users must select <em>Log &#8594;  Autogroup</em>. The <strong>Dive List</strong> panel
+(from the Main Menu) select <em>Log &#8594;  Autogroup</em>. The <strong>Dive List</strong> panel
 now shows only the titles for the trips.</p></div>
 <div class="sect3">
 <h4 id="_editing_the_title_and_associated_information_for_a_particular_trip">7.3.1. Editing the title and associated information for a particular trip</h4>
 <div class="paragraph"><p>Normally, in the dive list, minimal information is included in the trip title.
 More information about a trip can be added by selecting its trip title from
-the <strong>Dive List</strong>. This shows a <strong>Trip Notes</strong> tab in the <strong>Dive Notes</strong> panel. Here
-users can add or edit information about the date/time, the trip location and any
+the <strong>Dive List</strong>. This shows a <strong>Trip Notes</strong> tab in the <strong>Notes</strong> panel. Here
+one can add or edit information about the date/time, the trip location and any
 other general comments about the trip as a whole (e.g. the dive company that was
 dived with, the general weather and surface conditions during the trip, etc.).
 After entering this
-information, users should select <strong>Save</strong> from the buttons at the top right
+information, select <strong>Save</strong> from the buttons at the top right
 of the <strong>Trip Notes</strong>
-tab. The trip title in the <strong>Dive List</strong> panel should now reflect some of the
+tab. The trip title in the <strong>Dive List</strong> panel should now reflect the
 edited information.</p></div>
 </div>
 <div class="sect3">
@@ -3285,23 +3380,22 @@ the selected trip, revealing the individual dives performed during the trip.</p>
 </div>
 <div class="sect3">
 <h4 id="_collapsing_or_expanding_dive_information_for_different_trips">7.3.3. Collapsing or expanding dive information for different trips</h4>
-<div class="paragraph"><p>If a user right-clicks after selecting a particular trip in the dive list, the
-resulting context menu allows several possibilities to expand or collapse dives
-within trips. This includes expanding all trips, collapsing all trips and
-collapsing all trips except the selected one.</p></div>
+<div class="paragraph"><p>After selecting a particular trip in the dive list, the
+context menu allows several possibilities to expand or collapse dives
+within trips. This includes expanding all trips and collapsing all trips.</p></div>
 </div>
 <div class="sect3">
 <h4 id="_merging_dives_from_more_than_one_trip_into_a_single_trip">7.3.4. Merging dives from more than one trip into a single trip</h4>
-<div class="paragraph"><p>By right-clicking on a selected trip title in the <strong>Dive List</strong> panel, a
-context menu shows up that allows the merging of trips by either merging of the selected trip
-with the trip below or with the trip above.</p></div>
+<div class="paragraph"><p>After selecting a trip title, the context menu allows the merging
+of trips by either merging the selected trip with the trip below or with the
+trip above. (Merge trip with trip below; Merge trip with trip above)</p></div>
 </div>
 <div class="sect3">
 <h4 id="_splitting_a_single_trip_into_more_than_one_trip">7.3.5. Splitting a single trip into more than one trip</h4>
-<div class="paragraph"><p>If a trip includes five dives, the user can split this trip into two trips (trip 1:
-top 3 dives; trip 2: bottom 2 dives) by selecting and right-clicking the top
-three dives. The resulting context menu allows the user to create a new trip by
-choosing the option <strong>Create new trip above</strong>. The top three dives are then
+<div class="paragraph"><p>If a trip includes ten dives, the user can split this trip into two trips (trip 1:
+top 4 dives; trip 2: bottom 6 dives) by selecting and right-clicking the top
+four dives. The resulting context menu allows the user to create a new trip by
+choosing the option <strong>Create new trip above</strong>. The top four dives are then
 grouped
 into a separate trip. The figures below shows the selection and context menu
 on the left (A) and
@@ -3328,28 +3422,26 @@ calibration dives of the dive computer or dives of extremely short duration.</p>
 <div class="paragraph"><p>Users can unlink dives from the trip to which they belong. In order to do this,
 select and right-click
 the relevant dives to bring up the context menu. Then select the option <strong>Remove dive(s)
-from trip</strong>. The dive(s) now appear immediately above the trip to
-which they belonged.</p></div>
+from trip</strong>. The dive(s) now appear immediately above or below the trip to
+which they belonged, depending on the date and time of the unlinked dive.</p></div>
 </div>
 <div class="sect3">
 <h4 id="_add_a_dive_to_the_trip_immediately_above">7.4.3. Add a dive to the trip immediately above</h4>
 <div class="paragraph"><p>Selected dives can be moved from the trip to which they belong and placed within
-the trip immediately above the currently active trip. To do this, select
-and right-click
-the dive(s) to bring up the context menu, and then select <strong>Add dive(s) to trip
-immediately above</strong>.</p></div>
+a separate trip. To do this, select and right-click
+the dive(s) to bring up the context menu, and then select <strong>Create new trip above</strong>.</p></div>
 </div>
 <div class="sect3">
 <h4 id="_shift_the_start_time_of_dive_s">7.4.4. Shift the start time of dive(s)</h4>
 <div class="paragraph"><p>Sometimes it is necessary to adjust the start time of a dive. This may apply to
 situations where dives are performed in different time zones or when the dive
-computer has an erroneous time. In order to do this, user must select and right-click
+computer has an erroneous time. In order to do this, select and right-click
 the dive(s) to be
 adjusted. This action brings up the context menu on which the <strong>Shift times</strong>
 option should be selected. User must then specify the
 time
 (in hours and minutes) by which the dives should be adjusted and click on the
-option indicating whether the time adjustment should be forwards or backwards.</p></div>
+option indicating whether the time adjustment should be ealier or later.</p></div>
 </div>
 <div class="sect3">
 <h4 id="_merge_dives_into_a_single_dive">7.4.5. Merge dives into a single dive</h4>
@@ -3358,15 +3450,22 @@ for a few minutes, resulting in two or more dives being recorded by the dive
 computer and appearing as different dives in the <strong>Dive List</strong> panel. Users can
 merge these dives onto a single dive by selecting the appropriate dives,
 right-clicking them to bring up the context menu and then selecting <strong>Merge selected
-dives</strong>. It may be necessary to edit the dive information in the <strong>Dive Notes</strong>
+dives</strong>. It may be necessary to edit the dive information in the <strong>Notes</strong>
 panel to reflect events or conditions that apply to the merged dive. The figure
-below shows the depth profile of two such dives that were merged:</p></div>
+below shows the depth profile of two dives that were merged:</p></div>
 <div class="imageblock" style="text-align:center;">
 <div class="content">
 <img src="images/MergedDive.png" alt="Example: Merged dive" />
 </div>
 </div>
 </div>
+<div class="sect3">
+<h4 id="_undo_dive_manipulations">7.4.6. Undo dive manipulations</h4>
+<div class="paragraph"><p>Important actions on dives or trips, described above, can be undone or redone.
+This includes: <em>delete dives</em>, <em>merge dives</em>, <em>renumber dives</em> and <em>shift dive times</em>.
+To do this after performing any of these actions, from the <strong>Main Menu</strong> select
+<em>Edit</em>. This brings up the possibility to <em>Undo</em> or <em>Redo</em> an action.</p></div>
+</div>
 </div>
 <div class="sect2">
 <h3 id="S_Filter">7.5. Filtering the dive list</h3>
@@ -3376,12 +3475,11 @@ clothing. For instance, filtering allows one to list the deep dives at a particu
 dive site, or otherwise the cave dives with a particular buddy.</p></div>
 <div class="paragraph"><p>To open the filter, select <em>Log &#8594;  Filter divelist</em> from the main menu. This opens the
 <em>Filter Panel</em> at the top of the <em>Subsurface</em> window. Three icons are located at the top
-right hand of the filter panel. The <em>Filter Panel</em> can be reset
-(i.e. all current filters cleared) by selecting the <strong>+</strong>. The <em>Filter Panel</em> may also be
-minimised by selecting the middle icon. When minimised, only these three icons are shown.
+right hand of the filter panel (see image below). The <em>Filter Panel</em> can be reset
+(i.e. all current filters cleared) by selecting the <strong>yellow angled arrow</strong>. The <em>Filter Panel</em> may also be
+minimised by selecting the <strong>green up-arrow". When minimised, only these three icons are shown.
 The panel can be maximised by clicking the icon that minimised the panel. The filter may also be
-reset and closed by selecting the button with the flag.
-An example of the <em>Filter Panel</em> is shown in the figure below.</p></div>
+reset and closed by selecting the *red button</strong> with the white cross.</p></div>
 <div class="imageblock" style="text-align:center;">
 <div class="content">
 <img src="images/Filterpanel.jpg" alt="Figure: Filter panel" />
@@ -3394,13 +3492,13 @@ the attributes within that check list. For instance, typing "<em>ca</em>" in the
 textbox above the tags check list results in the tags check list being reduced
 to "<em>cave</em>" and "<em>cavern</em>". Filtering of the check list enables the rapid finding
 of search terms for filtering the dive list.</p></div>
-<div class="paragraph"><p>To activate filtering of the dive list, the check box of at least one item in one of
-the four check lists needs to be checked. The dive list is then shortened to include
-only the dives that pertain to the selection criteria specified in the check lists.
+<div class="paragraph"><p>To activate filtering of the dive list, check at least one check box in one of
+the four check lists. The dive list is then shortened to include
+only the dives that pertain to the criteria specified in the check lists.
 The four check lists work as a filter with <em>AND</em> operators, Subsurface
 filters therefore  for <em>cave</em> as a tag AND <em>Joe Smith</em> as a buddy; but the
 filters within a category are inclusive - filtering for <em>cave</em> and <em>boat</em>
-shows those dives that have either one or both of these tags.</p></div>
+shows those dives that have either one OR both of these tags.</p></div>
 </div>
 </div>
 </div>
@@ -3422,41 +3520,43 @@ Export dive information to <em>Facebook</em>
 </ul></div>
 <div class="sect2">
 <h3 id="S_facebook">8.1. Exporting dive information to <em>Facebook</em></h3>
-<div class="paragraph"><p>Export of dives to <em>Facebook</em> is handled differently from other types of export. This is because
-export to <em>Facebook</em> needs a connection to <em>Facebook</em>, requiring a <em>Facebook</em> userID and password.
-If, from the Main Menu, one selects <em>File &#8594;  Preferences &#8594;  Facebook</em>, a login screen is presented
-(see image <strong>A</strong> to the left, below).  Provide your <em>Facebook</em> userID and password.
-Once successful login to <em>Facebook</em> has been achieved, the panel
-in image <strong>B</strong>, below is presented. This panel has a button that needs to be selected in order to close the
+<div class="paragraph"><p>Export of dives to <em>Facebook</em> is handled differently from other types of export because
+a connection to <em>Facebook</em> is required, needing a <em>Facebook</em> userID and password.
+If, from the <strong>Main Menu</strong>, one selects <em>File &#8594;  Preferences &#8594;  Facebook</em>, a login screen is presented
+(image <strong>A</strong> to the left, below).  Provide a <em>Facebook</em> userID and password.
+Once a successful login to <em>Facebook</em> has been achieved, the panel
+in image <strong>B</strong>, below is presented, including a <em>Disconnect from Facebook</em> button to close the
 <em>Facebook</em> connection.</p></div>
 <div class="imageblock" style="text-align:center;">
 <div class="content">
 <img src="images/facebook1_f20.jpg" alt="Figure: Facebook login" />
 </div>
 </div>
+<div class="paragraph"><p>From the <em>Subsurface</em> window it is easy to determe whether <em>Subsurface</em> has a valid connection to <em>Facebook</em>
+From the <strong>Main Menu</strong>, select <em>Share on &#8594; Facebook</em> (image <strong>A</strong>, below). Normally, the <em>Facebook</em> option is greyed out. But
+if there is a connection to <em>Facebook</em>, this option is active (i.e. in black colour and can be selected).</p></div>
 <div class="paragraph"><p>Having established a login to <em>Facebook</em>, transfer of a dive profile to one&#8217;s <em>Facebook</em> timeline is easy.
-A <em>Facebook</em> icon appears in the <strong>Dive Notes</strong> panel of <em>Subsurface</em> (See image <strong>A</strong> below). Ensure that the dive
-that you want to transfer to the timeline is depicted in the <em>Subsurface</em> <strong>Dive Profile</strong> panel. Select the
-<em>Facebook</em> icon, and a dialogue is shown, determining the amount of additional information transferred
-with the dive profile (see image <strong>B</strong>, below). In order to transfer a dive profile to <em>Facebook</em>, the name of a
+Ensure that the dive to be transfered to the timeline is depicted in the <em>Subsurface</em> <strong>Dive Profile</strong> panel. If, from the <strong>Main Menu</strong>, one selects <em>Share on &#8594; Facebook</em> (see image <strong>A</strong> below), a dialogue is shown, determining the amount of additional information transferred
+with the dive profile (image <strong>B</strong>, below). In order to transfer a dive profile to <em>Facebook</em>, the name of a
 <em>Facebook</em> album needs to be provided. The checkboxes on the lefthand side allow one to determine how much
 additional information should be transferred with the dive profile. This information is shown in the text box
-on the right hand side of the panel (see image <strong>B</strong>, below). You can easily edit the message that will be posted
-right there in the text box. Having specified the additional information and verified the text you want to post, select
-the <em>OK</em> button which triggers the transfer to <em>Facebook</em>. After a while, an acknowledgement dialogue appears,
+on the right hand side of the panel (image <strong>B</strong>, below). One can easily edit the message that will be posted
+with the dive profile. Having specified the additional information and verified the text, select
+the <em>OK</em> button that triggers the transfer to <em>Facebook</em>. After a while, an acknowledgement dialogue appears,
 indicating successful transfer to <em>Facebook</em>.</p></div>
-<div class="paragraph"><p>Both the Album created and the post to your time line will be marked as
-private. In order for friends to be able to see the post you have to
+<div class="paragraph"><p>Both the album created and the post to one&#8217;s timeline will be marked as
+private. In order for friends to be able to see the post,
 change its permissions from a regular Facebook login either in a browser
-or a Facebook app. While this is an extra step the developers felt that
-this was the better solution to avoid having unwanted posts in your public
+or a Facebook app. While this is an extra step
+this is the better solution to avoid having unwanted posts in one&#8217;s public
 timeline.</p></div>
 <div class="imageblock" style="text-align:center;">
 <div class="content">
 <img src="images/facebook2_f20.jpg" alt="Figure: Facebook login" />
 </div>
 </div>
-<div class="paragraph"><p>If required, then close the <em>Facebook</em> connection by either closing <em>Subsurface</em> or by selecting <em>File &#8594;  Preferences &#8594;  Facebook</em> from the Main Menu, and clicking the appropriate button on the Facebook Preferences panel.</p></div>
+<div class="paragraph"><p>If required, then close the <em>Facebook</em> connection by either closing <em>Subsurface</em> or by selecting <em>File &#8594;  Preferences &#8594;  Facebook</em> from
+the Main Menu, and clicking the appropriate button on the Facebook Preferences panel.</p></div>
 </div>
 <div class="sect2">
 <h3 id="S_Export_other">8.2. Export dive information  to other destinations or formats</h3>
@@ -3515,21 +3615,22 @@ Universal Dive Data Format (<em>UDDF</em>). Refer to <em>http://uddf.org</em> fo
 <p>
 <em>HTML</em> format, in which the dive(s) are stored in HTML files, readable
   with an Internet browser. Most modern web browsers are supported, but JavaScript
-  must be enabled. This HTML file is not intended to be edited
-  by the users.
-  The HTML dive log contains most of the information and also contains a search
+  must be enabled. The HTML export cannot be changed or edited.
+  It contains most of the information recorded in the dive log. However, it does not show the
+  calculated values in the <strong>Dive Profile</strong> panel, e.g. calculated cylinder pressure, gas
+  pressures and MOD. The HTML export contains a search
   option to search the dive log. HTML export is specified on the second tab of the
   Export dialog (image <strong>B</strong> above). A typical use of this option is to export all one&#8217;s
   dives to a smartphone or a tablet where it would serve as a very portable record
-  of dives useful for dive companies that wish to verify the dive history of a diver.
-  This does away with the need to carry one&#8217;s original logbook with one
+  of dives useful for dive companies that wish to verify the dive history of a diver,
+  often doing away with the need to carry one&#8217;s original logbook with one
   when doing dives with dive companies.
 </p>
 </li>
 <li>
 <p>
 <em>Worldmap</em> format, an HTML file with a world map upon which each dive and
-  some information about it are indicated. This map is not editable. However, if one selects any
+  some information about it are indicated. This map is not editable. If one selects any
   of the dive sites on the map, a summary of the dive is available in text, as shown
   in the image below.
 </p>
@@ -3564,13 +3665,13 @@ Subsurface Numbers: if this option is checked, the dive(s) are exported with the
 <li>
 <p>
 Export Yearly Statistics: if this option is checked, a yearly statistics table will
-   be attached with the HTML exports.
+   be attached to the HTML exports.
 </p>
 </li>
 <li>
 <p>
-Export List only: a list of dives will only be exported and the detailed dive
-   information will not be available.
+Export List only: a list of dives only (date, time, depth, duration) will be exported
+   and the detailed dive information, e.g. dive profile, will not be available.
 </p>
 </li>
 </ul></div>
@@ -3597,11 +3698,104 @@ security of the dive log is therefore critical. In order to have a dive log that
 resistant to failure of a home computer hard drive, loss or theft of equipment, the
 Cloud is an obvious solution. This also has the added benefit that one can access one&#8217;s dive
 log from anywhere in the world without having to carry it with oneself. For this
-reason, facilities such as <em>divelogs.de</em> and <em>Diving Log</em> offer facilities to store
-dive log information on the Internet. Although <em>Subsurface</em> does not offer integrated
-Cloud storage of dive logs, it is simple to achieve this using several of the
-existing facilities on the Internet.</p></div>
-<div class="paragraph"><p>For instance
+reason, facilities such as <em>divelogs.de</em> and <em>Diving Log</em> offer to store
+dive log information on the Internet.</p></div>
+<div class="paragraph"><p><em>Subsurface</em> includes access to a transparently integrated cloud storage
+back end that is available to all Subsurface users. Storing and retrieving a dive log
+from the cloud is no more difficult than accessing the dives on the local hard disk.
+The only requirement is that one should first register as a user on the cloud.
+To use <em>Subsurface cloud storage</em> , follow these steps:</p></div>
+<div class="sect2">
+<h3 id="_create_a_cloud_storage_account">9.1. Create a cloud storage account</h3>
+<div class="ulist"><ul>
+<li>
+<p>
+Open the <strong>Network Preferences</strong> by selecting <em>File</em> &#8594; <em>Preferences</em> &#8594; <em>Network</em>.
+</p>
+</li>
+<li>
+<p>
+In the section headed <em>Subsurface cloud storage</em>, enter an email address that
+   <em>Subsurface</em> can use for user registration.
+</p>
+</li>
+<li>
+<p>
+Enter a novel password that <em>Subsurface</em> will use to store the
+  dive log in the cloud.
+</p>
+</li>
+<li>
+<p>
+Click <em>Apply</em> to send the above email address and password to the
+  (remote) cloud server. The server responds by sending a verification PIN to
+  the above email address (This is the <strong>only</strong> occasion that <em>Subsurface</em> uses the
+  email address provided above). The <strong>Network Preferences</strong> dialog now has a new PIN text
+   box, not visible previously.
+</p>
+</li>
+<li>
+<p>
+Enter the PIN in the corresponding text box in the <strong>Network Preferences</strong> dialog
+(this field is only visible while the server is waiting for email
+address confirmation)
+</p>
+</li>
+<li>
+<p>
+Click <em>Apply</em> again. The <em>Subsurface cloud storage</em> account
+will be marked as verified and the <em>Subsurface cloud storage</em> service is initialised for use.
+</p>
+</li>
+</ul></div>
+</div>
+<div class="sect2">
+<h3 id="_using_em_subsurface_cloud_storage_em">9.2. Using <em>Subsurface cloud storage</em></h3>
+<div class="ulist"><ul>
+<li>
+<p>
+Once the cloud storage has been initialised, two new items appear in the
+   <em>File</em> menu of the main menu system: <em>Open cloud storage</em> and <em>Save to cloud storage</em>.
+These options allow the user to load and save data to the <em>Subsurface
+cloud storage</em> server.
+</p>
+</li>
+<li>
+<p>
+In the <em>Defaults Preferences</em> tab, one can select to use the <em>Subsurface cloud
+storage</em> data as one&#8217;s default data file by checking the check box marked <em>Cloud storage default file</em>.
+ This means that the data from
+the <em>Subsurface cloud storage</em> is loaded when <em>Subsurface</em> starts ans saved there when one closes <em>Subsurface</em>.
+</p>
+</li>
+<li>
+<p>
+<em>Subsurface</em> keeps a local copy of the data and the cloud facility remains fully
+functional even if used while disconnected to the Internet. <em>Subsurface</em> simply synchronises the
+data with the cloud server the next time ithe program is used while the computer is
+connected to the Internet.
+</p>
+</li>
+</ul></div>
+</div>
+<div class="sect2">
+<h3 id="S_Cloud_storage">9.3. Web access to <em>Subsurface cloud storage</em></h3>
+<div class="paragraph"><p>One of the nice side benefits of using <em>Subsurface cloud storage</em> is that
+one can also access one&#8217;s dive data from any web browser. Simply open
+<a href="https://cloud.subsurface-divelog.org"><em>https://cloud.subsurface-divelog.org</em></a>,
+log in with the same email and password, and you can see an HTML export of
+the last dive data that was synced to the <em>Subsurface cloud storage</em>. The dive information
+that is shown is only the contents of the recorded dive logs, NOT the calculated values
+shown in the <strong>Profile</strong> panel,
+including some cylinder pressures, deco ceilings and O<sub>2</sub>/He/N<sub>2</sub> partial pressures.</p></div>
+</div>
+<div class="sect2">
+<h3 id="_other_cloud_services">9.4. Other cloud services</h3>
+<div class="paragraph"><p>If one prefers not to use the integrated cloud storage of dive logs (and
+don&#8217;t need the web access), it is also simple to store
+dive logs in the cloud using several of the existing facilities on the
+Internet.
+For instance
 <a href="http://www.dropbox.com/"><em>Dropbox</em></a>
 offers a free application that allows
 files on the Dropbox servers to be seen as a local folder on one&#8217;s desktop computer.</p></div>
@@ -3624,107 +3818,162 @@ involved for this service. Dropbox (Windows, Mac
 and Linux) can be installed by accessing the
 <a href="http://www.dropbox.com/install"><em>Install Page on the Dropbox website</em></a>
 . Alternatively one can use <em>Dropbox</em> as a mechanism to backup one&#8217;s dive log. To
-Store a dive log in the Cloud, select <em>File &#8594;  Save as</em> from the <em>Subsurface</em> main menu,
+Store a dive log on <em>Dropbox</em>, select <em>File &#8594;  Save as</em> from the <em>Subsurface</em> main menu,
 navigate to the <em>Dropbox</em> folder and select the <em>Save</em> button. To access the dive log
-in the Cloud, select <em>File &#8594;  Open Logbook</em> from the <em>Subsurface</em>
+in <em>Dropbox</em>, select <em>File &#8594;  Open Logbook</em> from the <em>Subsurface</em>
 main menu and navigate to the dive log file in the <em>Dropbox</em> folder and select the
 <em>Open</em> button.</p></div>
 <div class="paragraph"><p>Several paid services exist on the Internet (e.g. Google, Amazon) where the same
 process could be used for the Cloud-based storage of dive logs.</p></div>
 </div>
 </div>
+</div>
 <div class="sect1">
 <h2 id="S_PrintDivelog">10. Printing a dive log</h2>
 <div class="sectionbody">
-<div class="paragraph"><p><em>Subsurface</em> provides a simple interface to print a whole dive log or only a
-few selected dives, including dive profiles and other contextual information.</p></div>
+<div class="paragraph"><p><em>Subsurface</em> provides a simple and flexible interface to print a whole dive log or only a few selected dives.
+  Pre-installed templates or a custom written template can be used to choose where the data are fitted into the page.</p></div>
 <div class="paragraph"><p>Before printing, two decisions are required:</p></div>
 <div class="ulist"><ul>
 <li>
 <p>
 Should the whole dive log be printed or only part of it? If only part of the
-  dive log is required, then the user must select the required dives from the <strong>Dive List</strong> panel.
+  dive log is required, then select the required dives from the <strong>Dive List</strong> panel.
 </p>
 </li>
 <li>
 <p>
-What gas partial pressure information is required on the dive profile? Users should select
-  the appropriate toggle-buttons on the button bar to the left of the Dive Profile panel.
+If the dive profiles needs printing, what gas partial pressure information should be shown? Select
+  the appropriate toggle-buttons on the button bar to the left of the <strong>Dive Profile</strong> panel.
 </p>
 </li>
 </ul></div>
-<div class="paragraph"><p>Now the print options should be selected to match the user&#8217;s needs. To do this, user should select <em>File &#8594;  Print</em> from
-the Main menu. The following dialogue appears (see the image on the left [A],
-below).</p></div>
+<div class="paragraph"><p>If <em>File &#8594;  Print</em> is selected from the Main menu, the the dialogue below (image <strong>A</strong>) appears. Three
+specifications are needed to achieve the desired information and page layout:</p></div>
 <div class="imageblock" style="text-align:center;">
 <div class="content">
-<img src="images/PrintDiveLog.jpg" alt="FIGURE: Print dialogue" />
+<img src="images/Print1_f22.jpg" alt="FIGURE: Print dialogue" />
 </div>
 </div>
-<div class="paragraph"><p>Under <em>Print type</em> users need to select one of three options:</p></div>
+<div class="olist arabic"><ol class="arabic">
+<li>
+<p>
+Under <em>Print type</em> select one of two options:
+</p>
 <div class="ulist"><ul>
 <li>
 <p>
-Print the complete Dive List: to do this, <em>Table Print</em> should be selected.
+<em>Dive list print</em>: Print dives from the <strong>Dive List</strong> panel with profiles and other information.
 </p>
 </li>
 <li>
 <p>
-Print the selected dives (dive profiles and all other information) at 6
-  dives per printed page: to do this, users should select <em>6 dives per page</em>.
+<em>Statistics print</em>: Print yearly statistics of the dives.
+</p>
+</li>
+</ul></div>
+</li>
+<li>
+<p>
+Under <em>Print options</em> select:
+</p>
+<div class="ulist"><ul>
+<li>
+<p>
+Printing only the dives selected from the dive list prior to
+  activating the print dialogue by checking the box <em>Print only
+  selected dives</em>. If this check box is <strong>not</strong> checked all dives in
+  the <strong>Dive List</strong> panel are printed.
+</p>
+</li>
+<li>
+<p>
+Printing in colour, achieved by checking the box with <em>Print in colour</em>. If this check box
+  is not checked, printing is in monochrome (grey scale).
+</p>
+</li>
+</ul></div>
+</li>
+<li>
+<p>
+Under <em>Template</em> select a template to be used as the page layout. There are several templates
+(see image <strong>B</strong>, above).
+</p>
+<div class="ulist"><ul>
+<li>
+<p>
+<em>Table</em>: This prints a summary table of all dives selected (see below).
 </p>
 </li>
+</ul></div>
+</li>
+</ol></div>
+<div class="imageblock" style="text-align:center;">
+<div class="content">
+<img src="images/Print_summarylist_f22.jpg" alt="FIGURE: Print summary table" />
+</div>
+</div>
+<div class="ulist"><ul>
 <li>
 <p>
-Print the selected dives (dive profiles and all other information) at 2
-  dives per printed page: to do this, users should select <em>2 dives per page</em>.
+<em>Flow layout</em>: Print the text associated with each dive without printing the dive profiles
+     of each dive (see below):
 </p>
 </li>
+</ul></div>
+<div class="imageblock" style="text-align:center;">
+<div class="content">
+<img src="images/Print_flow_layout_f22.jpg" alt="FIGURE: Print flow layout" />
+</div>
+</div>
+<div class="ulist"><ul>
 <li>
 <p>
-Print the selected dives (dive profiles and all other information) at 1
-  dive per printed page: to do this, users should select <em>1 dive per page</em>.
+<em>One Dive</em>: Print one dive per page, also showing the dive profile (see below)
 </p>
 </li>
 </ul></div>
-<div class="paragraph"><p>Under <em>Print options</em> users need to select:</p></div>
+<div class="imageblock" style="text-align:center;">
+<div class="content">
+<img src="images/print2_f22.jpg" alt="FIGURE: Print one dive / page" />
+</div>
+</div>
 <div class="ulist"><ul>
 <li>
 <p>
-Printing only the dives that have been selected from the dive list prior to
-  activating the print dialogue, achieved by checking the box <em>Print only
-  selected dives</em>.
+<em>Two Dives</em>: Print two dives per page, also showing the dive profiles.
 </p>
 </li>
 <li>
 <p>
-Printing in colour, achieved by checking the box with <em>Print in colour</em>.
+<em>Six Dives</em>: Print six dives per page, also showing the dive profiles.
 </p>
 </li>
 </ul></div>
-<div class="paragraph"><p>The <em>Ordering</em> affects the layout of the page (or part of it) for each dive.
-The dive profile could be printed at the top of each dive, with the textual
-information underneath, or it could be printed with the textual information at
-the top with the dive profile underneath. Users should select the appropriate option in the
-print dialogue. See the image below which has a layout with
-text below the dive profile.</p></div>
 <div class="paragraph"><p>Users can <em>Preview</em> the printed page by selecting the <em>Preview</em> button on the
-dialogue. After preview, changes to the options in the print dialogue can be
-made, resulting in a layout that fits personal taste.</p></div>
-<div class="paragraph"><p>Next, select the <em>Print</em> button in the dialogue. This activates the regular print
-dialogue used by the user operating system (image [<strong>B</strong>] in the middle, above),
-allowing them to choose a printer and to set its properties (image [<strong>C</strong>] on the right,
-above).
-It is important to set the print resolution of the printer to an appropriate value by
-changing
-the printer properties. Finally, one can print the dives. Below is a (rather small)
-example of
-the output for one particular page.</p></div>
+dialogue (see image <strong>A</strong> at the start of this section). After preview, changes to
+the options in the print dialogue can be made, resulting in a layout that fits personal taste.</p></div>
+<div class="paragraph"><p>Next, select the <em>Print</em> button (see image <strong>A</strong> at the start of this section). This activates the regular print
+dialogue used by the user operating system,
+allowing one to choose a printer and to set its properties (see image below):</p></div>
+<div class="imageblock" style="text-align:center;">
+<div class="content">
+<img src="images/Print_print_f22.jpg" alt="FIGURE: Print dialog" />
+</div>
+</div>
+<div class="paragraph"><p>Set the print resolution of the printer to an appropriate value by changing
+the printer <em>Properties</em>. Finally, select the <em>Print</em> button to print the dives.
+Below is a (rather small) example of the output for one particular page.</p></div>
 <div class="imageblock" style="text-align:center;">
 <div class="content">
 <img src="images/Printpreview.jpg" alt="FIGURE: Print preview page" />
 </div>
 </div>
+<div class="sect2">
+<h3 id="_writing_a_custom_print_template_advanced">10.1. Writing a custom print template (advanced)</h3>
+<div class="paragraph"><p>Writing a custom template is an effective way to produce highly customized printouts. Subsurface uses HTML templates
+to render printing. One can create a template, export a new template, import an existing template and delete an existing template by using the appropriate buttons under the <em>Template</em> dropdown list in the print dialogue. See <a href="#S_APPENDIX_E">APPENDIX E</a> for information on how to write or modify a template.</p></div>
+</div>
 </div>
 </div>
 <div class="sect1">
@@ -3734,12 +3983,12 @@ the output for one particular page.</p></div>
 Suunto Vyper (Stinger, Mosquito, D3, Vyper, Vytec,
 Cobra, Gekko and Zoop) family of dive computers are supported. A large number of settings of these dive computers
 can be read and changed to different values. As a first step, ensure that the appropriate hardware driver
-is installed for the dive computer and that the device name of the dive computer is known.
+is installed for the dive computer (also required for downloading dives) and that the device name of the dive computer is known.
 See <a href="#_appendix_a_operating_system_specific_information_for_importing_dive_information_from_a_dive_computer">APPENDIX A</a> for information on how to do this.</p></div>
 <div class="paragraph"><p>Once the dive computer is connected to the <em>Subsurface</em> computer, select <em>File &#8594;  Configure dive
 computer</em> from the <em>Main Menu</em>. Provide the appropriate device name in the text box at the
-top of the configuration panel that opens and select the appropriate dive
-computer model from the panel on the lefthand (see image below).</p></div>
+top of the configuration panel and select the appropriate dive
+computer model from the panel on the left-hand (see image below).</p></div>
 <div class="imageblock" style="text-align:center;">
 <div class="content">
 <img src="images/Configure_dc_f20.jpg" alt="FIGURE: Configure dive computer" />
@@ -3750,7 +3999,7 @@ computer model from the panel on the lefthand (see image below).</p></div>
 <li>
 <p>
 <strong>Retrieve available details</strong>. This loads the existing configuration from the dive computer
-   to <em>Subsurface</em>, showing this in the configuration panel.
+   to <em>Subsurface</em>, showing it in the configuration panel.
 </p>
 </li>
 <li>
@@ -3783,12 +4032,14 @@ computer model from the panel on the lefthand (see image below).</p></div>
 <div class="sect1">
 <h2 id="S_Preferences">12. Setting user <em>Preferences</em> for <em>Subsurface</em></h2>
 <div class="sectionbody">
-<div class="paragraph"><p>There are several settings within <em>Subsurface</em> that the user can specify. These
-are found when selecting <em>File &#8594;  Preferences</em>. The settings are performed in
-five groups: <strong>Defaults</strong>, <strong>Units</strong>, <strong>Graph</strong>, <strong>Language</strong> and <strong>Network</strong>. All five sections
+<div class="paragraph"><p>There are several user-definable settings within <em>Subsurface</em>, found by selecting
+<em>File &#8594;  Preferences</em>. The settings are performed in
+seven groups: <strong>Defaults</strong>, <strong>Units</strong>, <strong>Graph</strong>, <strong>Language</strong> and <strong>Network</strong>, <strong>Facebook</strong> and <strong>Georeference</strong>,
+all of which
 operate on the same principles: the user must specify the settings that are to be changed, then
 these changes are saved using the <strong>Apply</strong> button. After applying all the new settings users can then
-leave the settings panel by selecting <strong>OK</strong>.</p></div>
+leave the settings panel by selecting <strong>OK</strong>. If <strong>Discard</strong> is selected, changes to the preferences
+are not saved.</p></div>
 <div class="sect2">
 <h3 id="_defaults">12.1. Defaults</h3>
 <div class="paragraph"><p>There are several settings in the <strong>Defaults</strong> panel:</p></div>
@@ -3806,24 +4057,43 @@ leave the settings panel by selecting <strong>OK</strong>.</p></div>
 </li>
 <li>
 <p>
-<strong>Dives</strong>: For the <em>Default Dive File</em> one need to specify the directory and
+<strong>Dives</strong>: For the <em>Default Dive File</em> one needs to specify the directory and
      file name of one&#8217;s
-     electronic dive log book. This is a file with filename extension .xml. When
-     launched, <em>Subsurface</em> will automatically load the specified dive log book.
+     electronic dive log book. This is a file with filename extension of either <em>.xml</em> or <em>ssrf</em>. When
+     launched, <em>Subsurface</em> will automatically load the specified dive log book. There are three options:
+</p>
+<div class="ulist"><ul>
+<li>
+<p>
+<em>No default file</em>: When checked, <em>Subsurface</em> does not automatically load a dive log at startup.
 </p>
 </li>
 <li>
 <p>
+<em>Local default file</em>: When checked, <em>Subsurface</em> automatically loads a dive log from the local hard disk
+       as described above.
+</p>
+</li>
+<li>
+<p>
+<em>Cloud storage default file</em>: When checked, <em>Subsurface automatically loads the dive log from the cloud
+       device that was initialised using the <strong>Preferences</strong> _Network</em> tab (see below).
+</p>
+</li>
+</ul></div>
+</li>
+<li>
+<p>
 <strong>Display invalid</strong>:  Dives can be marked as invalid (when a user wishes to hide
-     dives that he/she don&#8217;t consider valid dives, e.g. pool dives, but still want to
+     dives that he/she doesn&#8217;t consider valid dives, e.g. pool dives, but still want to
      keep them in the dive log). This controls whether those dives are displayed in
      the dive list.
 </p>
 </li>
 <li>
 <p>
-<strong>Default cylinder</strong>: Here users can specify the default cylinder listed in
-     the <strong>Equipment</strong> tab of the <strong>Dive Notes</strong> panel.
+<strong>Default cylinder</strong>: Specify the default cylinder listed in
+     the <strong>Equipment</strong> tab of the <strong>Notes</strong> panel.
 </p>
 </li>
 <li>
@@ -3833,20 +4103,12 @@ leave the settings panel by selecting <strong>OK</strong>.</p></div>
      dive. When viewing a different dive, these changes in axis characteristics do not
      happen instantaneously, but are animated. The <em>Speed</em> of animations can be controlled
      by setting this slider
-     with faster animation speed to the left, with a 0 value representing no animation
+     with faster animation speed to the left, and a 0 value representing no animation
      at all.
 </p>
 </li>
 <li>
 <p>
-<strong>Subsurface web service</strong>: When one subscribes to the <a href="#S_Companion">Subsurface web service</a>, a very
-     long and hard-to-remember userID is issued. This is the place to save that userID. By
-     checking the option <em>Save User ID locally?</em>, one ensures that a local copy of that userID
-     is saved.
-</p>
-</li>
-<li>
-<p>
 <strong>Clear all settings</strong>: As indicated in the button below this heading, all settings are
      cleared and set to default values.
 </p>
@@ -3860,11 +4122,16 @@ leave the settings panel by selecting <strong>OK</strong>.</p></div>
 <img src="images/Pref2_f20.jpg" alt="FIGURE: Preferences Units page" />
 </div>
 </div>
-<div class="paragraph"><p>Here user can choose between metric and imperial units of depth, pressure,
+<div class="paragraph"><p>Here users can choose between metric and imperial units of depth, pressure,
 volume, temperature and mass. By selecting the Metric or Imperial radio button
-at the top, users can specify that all units are in the chosen measurement system.
+at the top, one can specify that all units are in the chosen measurement system.
 Alternatively, if one selects the <strong>Personalise</strong> radio button, units can be selected
 independently, with some units in the metric system and others in imperial.</p></div>
+<div class="paragraph"><p>Irrespective
+of the above settings, dive time measurements can be either in seconds or minutes.
+Choose the appropriate option. GPS coordinates can be represented either as
+traditional coordinates (degrees, minutes, seconds) or as decimal degrees
+Choose the appropriate option.</p></div>
 </div>
 <div class="sect2">
 <h3 id="_graph">12.3. Graph</h3>
@@ -3884,30 +4151,37 @@ independently, with some units in the metric system and others in imperial.</p><
 <li>
 <p>
 Thresholds: <em>Subsurface</em> can display the nitrogen, oxygen and the helium partial pressures during
-   the dive. These are enabled using the toolbar on the left hand side of the <strong>Dive Profile</strong>
+   the dive, enabled by using the toolbar on the left hand side of the <strong>Dive Profile</strong>
    panel. For each of these graphs users can specify a threshold value on the right-hand side of the
-   Preferences panel. If any of the graphs go above this threshold level, the graph is
-   highlighted in red, indicating that the threshold has been exceeded.
+   Preferences panel. If any of the graphs go above the specified threshold level, the graph is
+   highlighted in red, indicating that the particular partial pressure threshold has been exceeded.
+</p>
+</li>
+<li>
+<p>
+_Max pO<sub>2</sub> is used for calculating the MOD when displaying the maximum operative depth (MOD)
+   for a dive. Specify an appropriate partial pressure. A value of 1.4 is commonly used.
 </p>
 </li>
 <li>
 <p>
-<em>Draw dive computer reported ceiling red</em>: This checkbox allows exactly what it says.
+<em>Draw dive computer reported ceiling red</em>: This checkbox allows exactly what it says. By default
+   the computer reported ceiling is shown in white.
    Not all dive computers report ceiling values. If the dive computer does report it, it may differ
-   from the ceilings calculated by <em>Subsurface</em>. This is because of the different algorithms and gradient factors available for calculating ceilings, as well as the dynamic way that a
+   from the ceilings calculated by <em>Subsurface</em> because of the different algorithms and
+   gradient factors, as well as the dynamic way that a
    dive computer can calculate ceilings during a dive.
 </p>
 </li>
 <li>
 <p>
-<em>Show unused cylinders in Equipment Tab</em>: This checkbox allows display of information about unused cylinders when viewing the <strong>Equipment Tab</strong>. Conversely, if this box is not checked, and any cylinders entered using the <strong>Equipment Tab</strong> are not used (e.g. there was no gas switch to such a cylinder), then these cylinders are omitted from that list.
+<em>Show unused cylinders in Equipment Tab</em>: This checkbox allows display of information about unused cylinders when viewing the <strong>Equipment Tab</strong>. Conversely, if this box is not checked, and if any cylinders entered using the <strong>Equipment Tab</strong> are not used (e.g. there was no gas switch to such a cylinder), then these cylinders are omitted from that list.
 </p>
 </li>
 <li>
 <p>
-<em>Show average depth</em>: Activating this checkbox causes <em>Subsurface</em> to draw a grey line across
-   the dive profile, indicating the mean depth of the dive up to a particular point in time during
-   that dive. Normally this is a u-shaped line indicating the deepest average depth just before the
+<em>Show average depth</em>: If this box is checked, the <strong>Dive Profile</strong> panel contains a grey line that indicates
+    the mean depth of the dive up to any time instant during the dive. Normally this is a u-shaped line indicating the deepest mean depth just before the
    ascent.
 </p>
 </li>
@@ -3917,18 +4191,18 @@ Thresholds: <em>Subsurface</em> can display the nitrogen, oxygen and the helium
 <p>
 <strong>Misc</strong>:
 </p>
-<div class="ulist"><ul>
+<div class="ulist" id="GradientFactors_Ref"><ul>
 <li>
 <p>
-Gradient Factors:* Here users can set the <em>gradient factors</em> used while diving. GF_Low is
+Gradient Factors (GFLow and GFHigh):* Set the <em>gradient factors</em> used while diving. GF_Low is
    the gradient factor at depth and GF_High is used just below the surface.
    At intermediate depths gradient factors between GF_Low and GF_High are used.
    Gradient factors add conservatism to the nitrogen exposure during a dive, in a
    similar way that many dive computers have a conservatism setting. The lower
    the value of a gradient factor, the more conservative the calculations are with
    respect to nitrogen loading and the deeper the ascent ceilings are. Gradient
-   factors of 20/60 are considered conservative and values of 60/90 are considered
-   harsh. Checking <strong>GFLow at max depth</strong> box causes GF_Low to be used at the
+   factors of 20/60 are considered conservative and values of 70/90 are considered
+   harsh. Checking the <strong>GFLow at max depth</strong> box causes GF_Low to be used at the
    deepest depth of a dive. If this box is not checked, GF_Low is applied at
    all depths deeper than the first deco stop. For more information see:
 </p>
@@ -3969,16 +4243,15 @@ Gradient Factors:* Here users can set the <em>gradient factors</em> used while d
 <li>
 <p>
 <em>Default CCR setpoint for dive planning:</em> Specify the O<sub>2</sub> setpoint for a
-    CCR dive plan. This determines the pO<sub>2</sub> that will be maintained
-    during a particular dive. This is the setpoint that is used at the start
-    of any CCR dive. Setpoint changes during the dive can be added via the
+    CCR dive plan. This determines the pO<sub>2</sub>  maintained
+    during a particular dive. Setpoint changes during the dive can be added via the
     profile context menu.
 </p>
 </li>
 <li>
 <p>
 <em>pSCR O<sub>2</sub> metabolism rate:</em> For a semiclosed rebreather (pSCR) system, this is the
-    volume of oxygen used by a diver each minute. Set this value for pSCR dive planning
+    volume of oxygen used by a diver during a minute. Set this value for pSCR dive planning
     and decompression calculations.
 </p>
 </li>
@@ -3986,7 +4259,7 @@ Gradient Factors:* Here users can set the <em>gradient factors</em> used while d
 <p>
 <em>pSCR ratio:</em> For pSCR equipment the dump ratio is the ratio of gas released to the
     environment to that of the gas recirculated to the diver. Set this value for a
-    pSCR dive plan.
+    pSCR dive plan. A 1:10 ratio is commonly used.
 </p>
 </li>
 </ul></div>
@@ -4003,35 +4276,72 @@ Gradient Factors:* Here users can set the <em>gradient factors</em> used while d
 </div>
 <div class="paragraph"><p>A checkbox allows one to use the <em>System Default</em> language which in most cases
 will be the correct setting; with this <em>Subsurface</em> simply runs in the same
-language / country settings as the underlying OS. If this is for some reason
-undesirable users can uncheck this checkbox and pick a language / country
+language / country settings as the underlying operating system. If this is for some reason
+undesirable one can uncheck this checkbox and pick a language / country
 combination from the list of included localizations. The <em>Filter</em> text box allows
 one to list similar languages. For instance there are several system variants of English
-or French. This particular preference requires a restart of <em>Subsurface</em> to take
-effect.</p></div>
+or French. <strong>This particular preference requires a restart of <em>Subsurface</em> to take
+effect</strong>.</p></div>
 </div>
 <div class="sect2">
 <h3 id="_network">12.5. Network</h3>
-<div class="paragraph"><p>This panel facilitates communication between <em>Subsurface</em> and data sources on the Internet.</p></div>
+<div class="paragraph"><p>This panel facilitates communication between <em>Subsurface</em> and data sources on the Internet.
+This is important, for instance, when <em>Subsurface</em> needs to communicate with Internet
+services such as Cloud storage or the <a href="#S_Companion"><em>Subsurface Companion app</em></a>. These Internet requirements are determined by one&#8217;s type of
+connection to the Internet and by the Internet Service Provider (ISP) used.
+One&#8217;s ISP should provide the appropriate information.</p></div>
 <div class="imageblock" style="text-align:center;">
 <div class="content">
 <img src="images/Pref5_f20.jpg" alt="FIGURE: Preferences Network page" />
 </div>
 </div>
-<div class="paragraph"><p>This is important, for instance, when <em>Subsurface</em> needs to communicate with Internet
-services such as the <a href="#S_Companion"><em>Subsurface Companion app</em></a> or data export/import
-from <em>Divelogs.de</em>. These Internet requirements are determined by one&#8217;s type of
-connection to the Internet and by the Internet Service Provider (ISP) used.
-One&#8217;s ISP should provide the appropriate information.
-If a proxy server is used for Internet access, the appropriate information needs
-to be provided here. The type of proxy needs to be selected from the dropdown list.
+<div class="paragraph"><p>This dialogue has three sections:</p></div>
+<div class="ulist"><ul>
+<li>
+<p>
+<em>Proxy type</em>:
+If a proxy server is used for Internet access, the type of proxy needs to be selected from the dropdown list,
 after which the IP address of the host and the appropriate port number should
 be provided. If the proxy server uses authentication, the appropriate userID and
-password also needs to be provided so that <em>Subsurface</em> can automatically pass
-through the proxy server to access the Internet.</p></div>
+password are required so that <em>Subsurface</em> can automatically pass
+through the proxy server to access the Internet. This information is usually obtained
+from one&#8217;s ISP.
+</p>
+</li>
+<li>
+<p>
+<em>Subsurface cloud storage</em>: To store one&#8217;s dive log in the cloud, a valid email address
+   and password are required. This allows <em>Subsurface</em> to email security information
+   regarding cloud storage to a user, and to set up the cloud storage appropriately.
+   Two additional options are given:
+</p>
+<div class="ulist"><ul>
+<li>
+<p>
+<em>Sync to cloud in the background</em>: This option allows saving of dive information to the cloud storage
+   while the user performs other tasks within <em>Subsurface</em>.
+</p>
+</li>
+<li>
+<p>
+<em>Save password locally</em>: This allows local storage of the cloud storage password. Note that this
+   information is saved in raw text form, not encoded in any way.
+</p>
+</li>
+</ul></div>
+</li>
+<li>
+<p>
+<em>Subsurface web service</em>: When one subscribes to the <a href="#S_Companion">Subsurface web service</a>, a very
+     long and hard-to-remember userID is issued. This is the place to save that userID. By
+     checking the option <em>Save User ID locally?</em>, one ensures that a local copy of that userID
+     is saved.
+</p>
+</li>
+</ul></div>
 </div>
 <div class="sect2">
-<h3 id="_facebook_accesss">12.6. Facebook Accesss</h3>
+<h3 id="S_Facebook">12.6. Facebook Accesss</h3>
 <div class="paragraph"><p>This panel allows one to log into a Facebook account in order to transfer information
 from Subsurface to Facefook.</p></div>
 <div class="imageblock" style="text-align:center;">
@@ -4041,11 +4351,25 @@ from Subsurface to Facefook.</p></div>
 </div>
 <div class="paragraph"><p>If one provides a valid Facebook userID and password, a
 connection to Facebook is created. The connection to Facebook is closed when one
-closes down Subsurface. At this point the checkbox labelled "Keep connection to Subsurface",
+closes down Subsurface. Currently the checkbox labelled "Keep me logged in to Subsurface",
 on the login screen has no effect.
 See the section <a href="#S_facebook">Exporting dive profiles to Facebook</a>
 for more information.</p></div>
 </div>
+<div class="sect2">
+<h3 id="_georeference">12.7. Georeference</h3>
+<div class="paragraph"><p><em>Subsurface</em> provides a geo-lookup service (that is, given the coordinates of a dive site (derived from
+a click on the <strong>Dive Map panel</strong> at the bottom right of the <em>Subsurface</em> window, or from a GPS instrument or
+from the <em>Subsurface</em> Companion app), a lookup on the Internet is performed to find
+the name of the closest known location. Obviously this function only works if <em>Subsurface</em> has an
+Internet connection. The preference of the dive site name can be configured, e.g. <em>Country/State/City</em>
+or <em>City/State/Country</em> (see image below).</p></div>
+<div class="imageblock" style="text-align:center;">
+<div class="content">
+<img src="images/Pref7_f20.jpg" alt="FIGURE: Facebook login panel" />
+</div>
+</div>
+</div>
 </div>
 </div>
 <div class="sect1">
@@ -4108,7 +4432,7 @@ A user who is not absolutely sure about any of the above requirements should not
 <h3 id="_the_em_subsurface_em_dive_planner_screen">13.1. The <em>Subsurface</em> dive planner screen</h3>
 <div class="paragraph"><p>Like the <em>Subsurface</em> dive log, the planner screen is divided into several sections (see image below). The <strong>setup</strong>
 parameters for a dive are entered into the several sections on the left hand side of the screen.
-The setup is divided into several sections: Available Gases, Rates, Planning, Gas Options and Dive Notes.</p></div>
+The setup is divided into several sections: Available Gases, Rates, Planning, Gas Options and Notes.</p></div>
 <div class="paragraph"><p>At the top right hand is a green <strong>design panel</strong> upon which the profile of the dive can be
 manipulated directly by dragging and clicking as explained below. This feature makes the
 <em>Subsurface</em> dive planner unique in ease of use.</p></div>
@@ -4122,11 +4446,11 @@ any warning messages about the dive plan are printed.</p></div>
 </div>
 </div>
 <div class="sect2">
-<h3 id="_open_circuit_dives_as_an_example_of_dive_planning">13.2. Open circuit dives as an example of dive planning</h3>
+<h3 id="_open_circuit_dives">13.2. Open circuit dives</h3>
 <div class="ulist"><ul>
 <li>
 <p>
-Towards the left bottom of the planner (circled in blue in the image below) is a dropbox with three options. Select the appropriate one of these:
+Towards the centre bottom of the planner (circled in blue in the image above) is a dropbox with three options. Select the appropriate one of these:
 </p>
 <div class="ulist"><ul>
 <li>
@@ -4148,41 +4472,167 @@ pSCR
 </li>
 <li>
 <p>
+Choose the Open Circuit option.
+</p>
+</li>
+<li>
+<p>
 In the top left-hand area of the planning screen, ensure that the constant dive parameters are
-  appropriate. These are: Start date and time of the dive, Atmospheric Pressure and Altitude
+  appropriate. These are: Start date and time of the intended dive, Atmospheric Pressure and Altitude
   above sea level of the dive site. The atmospheric pressure can also be entered as an altitude
-  in metres, assuming an atmospheric pressure of 1.013 bar.
+  in metres, assuming a sea-level atmospheric pressure of 1.013 bar.
 </p>
 </li>
 <li>
 <p>
-In the table labeled <em>Available Gases</em>, add the information of the cylinders to be used
+In the table labelled <em>Available Gases</em>, add the information of the cylinders to be used
   as well as the gas composition within that cylinder. This is done in a similar way as for
   <a href="#S_CylinderData">providing cylinder data for dive logs</a>. Choose the cylinder type by
   double clicking the cylinder type and using the dropdown list, then specify the work
   pressure of this cylinder. By leaving the oxygen concentration (O2%) filed empty,
   the cylinder is assumed to contain air. Otherwise enter the oxygen and/or helium
   concentration in the boxes provided in this dialogue. Add additional cylinders by using the
-  "+" icon to the top righthand of the dialogue.
+  "+" icon to the top right-hand of the dialogue.
+</p>
+</li>
+<li>
+<p>
+The profile of the planned dive can be created in two ways:
+</p>
+<div class="ulist"><ul>
+<li>
+<p>
+Drag the waypoints
+    (the small white circles) on the existing dive profile in a way to represent the dive. Additional
+    waypoints can be created by double-clicking the existing dive profile. Waypoints can be deleted
+    by right-clicking a particular waypoint and selecting the <em>delete</em> item from the resulting
+    context menu.
+</p>
+</li>
+<li>
+<p>
+The most efficient way to create a dive profile is to enter the appropriate values into the table
+    marked <em>Dive planner points</em>. The first line of the table represents the duration and the final
+    depth of the descent from the surface. Subsequent segments describe the bottom phase of the dive.
+    The <em>CC set point</em> column is only relevant for closed circuit divers.
+    The ascent is usually not specified because this is what the planner is supposed to calculate.
+    Add additional segments to the profile by selecting the "+" icon at the top right hand of the
+    table. Segments entered into the <em>Dive planner points</em> table automatically appear in the <strong>Dive
+    Profile</strong> diagram.
+</p>
+</li>
+</ul></div>
+</li>
+</ul></div>
+<div class="sect3">
+<h4 id="_recreational_dives">13.2.1. Recreational dives</h4>
+<div class="paragraph"><p>Recreational mode is what comes closest to planning a dive based on the non-decompression limit (NDL).
+It computes the maximal time a diver can stay at the current depth without incurring any mandatory decompression
+stops and without using more than the existing gas (minus a reserve). The planner automatically takes
+into account the nitrogen load incurred in previous dives. But conventional dive tables are also used in a
+way that can take into account previous dives. Why use a dive planner for recreational dives? Using
+recreational dive tables, the maximum depth of a dive is taken into account. However, few dives are
+undertaken at a constant depth corresponding to the maximum depth (i.e. a "square" dive profile). This means
+that dive tables overestimate the nitrogen load incurred during previous dives. The <em>Subsurface</em>
+dive planner calculates nitrogen load according to the real dive profiles of all uploaded previous dives,
+in a similar way as dive computers calculate nitrogen load during a dive. This means that the diver gets <em>credit</em>
+in terms of nitrogen loading for not remaining at maximum depth during previous dives, enabling planning of a
+longer subsequent dive. For the planner to work it is therefore crucial to upload all previous dives
+onto <em>Subsurface</em> before performing dive planning.</p></div>
+<div class="paragraph"><p>To plan a dive, the appropriate settings need to be defined.</p></div>
+<div class="ulist"><ul>
+<li>
+<p>
+Ensure that the date and time is set to that of the intended dive. This allows calculation of
+the nitrogen load incurred during previous dives.
+</p>
+</li>
+<li>
+<p>
+Immediately under the heading <em>Planning</em> are two checkboxes <em>Recreational</em> and <em>Safety Stop</em>.
+  Check these two boxes.
+</p>
+</li>
+<li>
+<p>
+Then define the cylinder size,
+  the gas mixture (air or % oxygen) and the starting cylinder pressure in the top left-hand
+  section of the planner under <em>Available gases</em>.
+</p>
+</li>
+<li>
+<p>
+The planner calculates whether the specified cylinder contains enough air/gas to complete
+  the planned dive. In order for this to be realistic, under <em>Gas options</em>, specify an appropriate
+  surface air consumption (SAC) rate for <em>Bottom SAC</em>. Suitable values are between 15 l/min and 30 l/min,
+  with novice divers or difficult dives requiring SAC rates closer to 30l/min.
 </p>
 </li>
 <li>
 <p>
-The dialogue indicating <em>Dive Planner Points</em> is usually not used at this stage of the dive
-  planning.
+Define the amount of gas that the cylinder must have at the end of the bottom section of the
+  dive just before ascent. A value of 50 bar is often used. The reason for this reserve gas is to provide for the possible
+  need need to bring one&#8217;s buddy to the surface using gas sharing. How much gas is used in
+  sharing depends on the depth of the ascent. This can be a bit hard to estimate, so most agencies assume a
+  fixed amount of gas, or actually of pressure e.g. 40 or 50 bar or 25% or 33% (rule of thirds). But <em>Subsurface</em> can do better
+  because it knows about the ascent and that is why we add the amount of gas during the ascent (i.e. the "deco gas“).
+  Subsurface still uses a fixed pressure „reserve“ but that is supposed to be for the additional gas used around the realisation
+  that there is a problem and one&#8217;s pulse rate goes up when one starts to buddy breathe. This reserve amount is user configurable.
+</p>
+</li>
+<li>
+<p>
+Define the depth of the dive by dragging the waypoints (white dots) on the dive profile or
+  (even better) defining the appropriate depths using the table under <em>Dive planner points</em> as
+  desribed under the previous heading. If
+  this is a multilevel dive, set the appropriate dive depths to represent the dive plan by adding
+  waypoints to the dive profile or by adding appropriate dive planner points to the <em>Dive Planner Points</em>
+  table. <em>Subsurface</em> will automatically extend the bottom section of the dive to the maximum
+  duration within the no-decompression limits (NDL).
+</p>
+</li>
+<li>
+<p>
+The ascent speed can be changed. The default ascent speeds are those considered safe for recreational
+  divers.
 </p>
 </li>
 </ul></div>
-<div class="paragraph"><p><strong>The planning is performed in three stages</strong></p></div>
+<div class="paragraph"><p>The dive profile in the planner indicates the maximum dive time within no-deco limits using the
+Bühlmann ZH-L16 algorithm and the gas and depth settings specified as described above. The <em>Subsurface</em> planner
+allows rapid assessment of dive duration as a function of dive depth, given the nitrogen load incurred during previous dives. The
+dive plan includes estimates of the amount of air/gas used, depending on the cylinder settings specified
+under <em>Available gases</em>. If the initial cylinder pressure is set to 0, the dive duration shown is the
+true no-deco limit (NDL) without taking into account gas used during the dive. If the surface above the dive profile is RED
+it means that recreational dive limits are exceeded and either the dive duration or the dive depth needs to be reduced.</p></div>
+<div class="paragraph"><p>Below is an image of a dive plan for a recreational dive at 30 metres. Although the no-deco limit (NDL) is 23
+minutes, the duration of the dive is limited by the amount of air in the cylinder, reflected by the information in the
+text box at the bottom right of the panel that requires sufficient air for buddy-sharing during the ascent.</p></div>
+<div class="imageblock" style="text-align:center;">
+<div class="content">
+<img src="images/rec_diveplan.jpg" alt="FIGURE: A recreational dive plan: setup" />
+</div>
+</div>
+</div>
+<div class="sect3">
+<h4 id="_non_recreational_open_circuit_dives_including_decompression">13.2.2. Non-recreational open circuit dives, including decompression</h4>
+<div class="paragraph"><p>Non-recreational dive planning involves exceeding the no-deco limits and/or using multiple breathing gases.
+Such dives are planned in three stages:</p></div>
 <div class="paragraph"><p><strong>a) Nitrogen management</strong>: This is performed by specifying the rates for descent and ascent,
-as well as the gradient factors (GFLow and GFHigh) under the headings <em>Rates</em> and <em>Planning</em>
-to the bottom left of the planning screen. Initially, the GFHigh and GFLow values in the <em>Preferences</em>
+as well as the deco model (GFLow, GFHigh or Conservatism level) under the headings <em>Rates</em> and <em>Planning</em>
+to the bottom left of the planning screen. Two deco models are supported the Bühlmann model and the VPM-B
+model. Select one of the two models. When selecting the Bühlmann model, the gradient factors (GF_high and GF_low
+need to be specified. Initially, the GFHigh and GFLow values in the <em>Preferences</em>
 panel of <em>Subsurface</em> is used. If these are changed within the planner (see <em>Gas Options</em> within
 the planner), the new values are
 used without changing the original values in the <em>Preferences</em>. Gradient Factor settings strongly affect the calculated ceilings and their depths.
 A very low GFLow value brings about decompression stops early on during the dive.
- ** For more information about Gradient factors, see the section on <a href="#S_GradientFactors">Gradient Factor Preference settings</a>.
-For more information external to this manual see:</p></div>
+ ** For more information about Gradient factors, see the section on <a href="#S_GradientFactors">Gradient Factor Preference settings</a>.</p></div>
+<div class="paragraph"><p>If the VPM-B model is selected, the Conservatism_level needs to be specified on a scale of 0 (least conservative) to 4 (most conservative).
+This model tends to give deco stops at deeper levels than the Bühlmann model and often results in slightly shorter
+dive durations than the Bühlmann model. When selecting one of these models, keep in mind that they are NOT exact physiological models but
+only mathematical models that appear to work in practice.</p></div>
+<div class="paragraph"><p>For more information external to this manual see:</p></div>
 <div class="ulist"><ul>
 <li>
 <p>
@@ -4197,7 +4647,7 @@ For more information external to this manual see:</p></div>
 <li>
 <p>
 <a href="http://www.amazon.com/Deco-Divers-Decompression-Theory-Physiology/dp/1905492073/ref=sr_1_1?s=books&amp;ie=UTF8&amp;qid=1403932320&amp;sr=1-1&amp;keywords=deco+for+divers"><em>Deco for Divers</em>, by Mark Powell (2008). Aquapress</a> Southend-on-Sea, UK. ISBN 10: 1-905492-07-3.
-An excellent non-technical review.
+An excellent non-technical review that discusses both the Bühlmann deco model and the VPM-B model.
 </p>
 </li>
 </ul></div>
@@ -4236,7 +4686,7 @@ planner, a default dive of depth 15 m for 40 min is offered in the bue design su
 right hand of the screen. The white dots (waypoints) on the
 profile can be dragged with a mouse. Create more waypoints by double-clicking on the profile
 line and ensuring that the profile reflects the intended dive. Drag the waypoints to represent
-the depth and duration of the dive. It is NOt necessary to specify the ascent part of the dive
+the depth and duration of the dive. It is NOT necessary to specify the ascent part of the dive
 since the planner calculates this, based on the settings that have been specified.
 If any of the management limits (for nitrogen, oxygen or gas) is exceeded, the surface
 above the dive profile changes from BLUE to RED.</p></div>
@@ -4246,7 +4696,7 @@ of that table corresponds to one of the gas mixtures specified in the <em>Availa
 Add new waypoints until the main features of the dive have been completed, e.g. the
 bottom time segment and deep stops (if these are implemented). Leave the remaining
 waypoints on the ascent to <em>Subsurface</em>. In most cases <em>Subsurface</em>
-computes additional way points in order to fulfill decompression requirements for that
+computes additional way points in order to fulfil decompression requirements for that
 dive. A waypoint can be moved by selecting that waypoint and by using the arrow keys.
 The waypoints listed in the <em>Dive Planner Points</em> dialogue can be edited by hand in
 order to obtain a precise presentation of the dive plan. In fact, one can create the
@@ -4279,8 +4729,8 @@ in the <strong>Dive List</strong> panel of <em>Subsurface</em>.</p></div>
 <div class="paragraph"><p><strong>The dive plan details</strong></p></div>
 <div class="paragraph"><p>On the bottom right of the dive planner, under <em>Dive Plan Details</em>, the exact details
 of the dive plan are provided. These details may be modified by checking any of the
-options under the <em>Dive Notes</em> section of the dive planner, immediately to the left
-of the <em>Dive Plan Details</em>. If a <em>Verbatim diveplan</em>
+options under the <em>Notes</em> section of the dive planner, immediately to the left
+of the <em>Dive Plan Details</em>. If a <em>Verbatim dive plan</em>
 is requested, a detailed sentence-level explanation of the dive plan is given. If any
 of the management specifications have been exceeded during the planning, a warning
 message is printed underneath the dive plan information.</p></div>
@@ -4289,20 +4739,44 @@ level is indicated in the <em>Dive Plan Details</em>. This duration INCLUDES the
 time to get to that level. However, if the <em>Display transition in deco</em> option is checked,
 the transitions are shown separately from the segment durations at a particular level.</p></div>
 </div>
+</div>
+<div class="sect2">
+<h3 id="_planning_pscr_dives">13.3. Planning pSCR dives</h3>
+<div class="paragraph"><p>To plan a dive using a passive semi-closed rebreather (pSCR), select <em>pSCR</em> rather than
+<em>Open circuit</em> in the dropdown list.
+The parameters of the pSCR dive can be set by selecting  <em>File &#8594;   Preferences &#8594;   Graph</em>
+from the main menu, where the gas consumption calculation takes into account the pSCR dump
+ratio (default 10:1) as well as the metabolism rate. The calculation also takes the oxygen drop
+accross the mouthpiece of the rebreather into account. If the
+pO<sub>2</sub> drops below what is considered a save value, a warning appears in the <em>Dive plan
+details</em>. A typical pSCR configuration is with a single cylinder and one or more bail-out
+cylinders. Therefore the setup of the <em>Available gases</em> and the <em>Dive planner points</em> tables
+are very similar to that of a CCR dive plan, described below. However, no oxygen setpoints
+are specified for pSCR dives. Below is a dive plan for a pSCR dive. The dive is comparable
+to that of the CCR dive below, but note the longer ascent duration due to the lower oxygen
+in the loop due to the oxygen drop across the mouthpiece of the pSCR equipment.</p></div>
+<div class="imageblock" style="text-align:center;">
+<div class="content">
+<img src="images/Planner_pSCR1_f20.jpg" alt="FIGURE: Planning a pSCR dive: setup" />
+</div>
+</div>
+</div>
 <div class="sect2">
-<h3 id="_planning_ccr_dives">13.3. Planning CCR dives</h3>
+<h3 id="_planning_ccr_dives">13.4. Planning CCR dives</h3>
 <div class="paragraph"><p>To plan a dive using a closed circuit rebreather, select the <em>CCR</em> option in the dropdown
 list, circled in blue in the image below.</p></div>
 <div class="paragraph"><p><strong>Available gases</strong>: In the <em>Available gases</em> table, enter the cylinder information for the
 diluent cylinder and for any bail-out cylinders. Do NOT enter the information for the oxygen
 cylinder since it is implied when the <em>CCR</em> dropdown selection is made.</p></div>
-<div class="paragraph"><p><strong>Entering setpoints</strong>: Specify a default setpoint in the Preferences tab, by selecting <em>File &#8594;  Preferences &#8594;  Graph</em> from the main menu. All user-entered segments in the <em>Dive planner points</em> table
+<div class="paragraph"><p><strong>Entering setpoints</strong>: Specify a default setpoint in the Preferences tab, by selecting <em>File &#8594;  Preferences &#8594;  Graph</em> from
+the main menu. All user-entered segments in the <em>Dive planner points</em> table
 use the default setpoint value. Then, different setpoints can be specified for dive segments
 in the <em>Dive planner points</em> table. A zero setpoint
 means the diver bails out to open circuit mode for that segment. The decompression is always calculated
 using the setpoint of the last manually entered segment. So, to plan a bail out ascent for a
 CCR dive, add a one-minute dive segment to the end with a setpoint value of 0. The decompression
-algorithm does not switch deco-gases automatically while in CCR mode (i.e. when a positive setpoint is specified) but, of course, this is calculated for bail out ascents.</p></div>
+algorithm does not switch deco-gases automatically while in CCR mode (i.e. when a positive setpoint is specified) but,
+of course, this is calculated for bail out ascents.</p></div>
 <div class="paragraph"><p>The dive profile for a CCR dive may look something like the image below.</p></div>
 <div class="imageblock" style="text-align:center;">
 <div class="content">
@@ -4313,27 +4787,6 @@ algorithm does not switch deco-gases automatically while in CCR mode (i.e. when
 so gas consumptions of 0 litres are the norm.</p></div>
 </div>
 <div class="sect2">
-<h3 id="_planning_pscr_dives">13.4. Planning pSCR dives</h3>
-<div class="paragraph"><p>To plan a dive using a passive semi-closed rebreather (pSCR), select <em>pSCR</em> rather than
-<em>Open circuit</em> in the dropdown list.
-The parameters of the pSCR diver can be set by selecting  <em>File &#8594;   Preferences &#8594;   Graph</em>
-from the main menu, where the gas consumption calculation takes into account the pSCR dump
-ratio (default 10:1) as well as the metabolism rate. The calculation also takes the oxygen drop
-accross the mouthpiece of the rebreather into account. If the
-pO<sub>2</sub> drops below what is considered a save value, a warning appears in the <em>Dive plan
-details</em>. A typical pSCR configuration is with a single cylinder and one or more bail-out
-cylinders. Therefore the setup of the <em>Available gases</em> and the <em>Dive planner points</em> tables
-are very similar to that of a CCR dive plan, described above. However, no oxygen setpoints
-are specified for pSCR dives. Below is a dive plan for a pSCR dive. The dive is comparable
-to that of the CCR dive above, but note the longer ascent duration due to the lower oxygen
-in the loop due to the oxygen drop across the mouthpiece of the pSCR equipment.</p></div>
-<div class="imageblock" style="text-align:center;">
-<div class="content">
-<img src="images/Planner_pSCR1_f20.jpg" alt="FIGURE: Planning a pSCR dive: setup" />
-</div>
-</div>
-</div>
-<div class="sect2">
 <h3 id="S_Replan">13.5. Modifying an existing dive plan</h3>
 <div class="paragraph"><p>Normally, when a dive plan has been saved, it is accessible from the <strong>Dive List</strong>, like any
 other dive log. Within the <strong>Dive List</strong> there is not a way to change a saved dive plan.
@@ -4370,7 +4823,7 @@ for wet notes. Alternatively one can cut and paste the <em>Dive Plan Details</em
 inclusion in a text file or word processing document.</p></div>
 <div class="paragraph"><p>Dive plans have many characteristics in common with dive logs (dive profile, dive notes, etc).
 After a dive plan has been saved, the dive details and gas calculations are saved in
-the <strong>Dive Notes</strong> tab. While a dive plan is being designed, it can be printed using
+the <strong>Notes</strong> tab. While a dive plan is being designed, it can be printed using
 the <em>Print</em> button in the dive planner. This prints the dive details and gas calculations
 in the <em>Dive Plan Details</em> panel of the dive planner. However, after the plan has been saved, it is
 represented in a way very similar to a dive log and the gas calculations cannot be
@@ -4403,11 +4856,21 @@ dealing with the appropriate operations.</p></div>
 </li>
 <li>
 <p>
+<em>Open cloud storage</em> - Open the dive log previously saved in <a href="#S_Cloud_storage"><em>Cloud storage</em></a>.
+</p>
+</li>
+<li>
+<p>
 <em>Save</em> - Save the dive logbook that is currently open.
 </p>
 </li>
 <li>
 <p>
+<em>Save to cloud storage</em> - Save the current dive log to <a href="#S_Cloud_storage"><em>Cloud storage</em></a>.
+</p>
+</li>
+<li>
+<p>
 <em>Save as</em> - Save the current logbook under a different file name.
 </p>
 </li>
@@ -4434,6 +4897,12 @@ dealing with the appropriate operations.</p></div>
 </li>
 <li>
 <p>
+<a href="#S_FindMovedImages"><em>Find moved images</em></a> - If photos taken during dives have been moved to
+      a different disk or directory, locate them and link them to the appropriate dives.
+</p>
+</li>
+<li>
+<p>
 <a href="#S_Configure"><em>Configure dive computer</em></a> - Edit the configuration of a dive computer.
 </p>
 </li>
@@ -4483,12 +4952,17 @@ dealing with the appropriate operations.</p></div>
 </li>
 <li>
 <p>
+<em>Edit dive</em> - Edit a dive of which the profile was entered by hande and not from a dive computer.
+</p>
+</li>
+<li>
+<p>
 <a href="#S_DivePlanner"><em>Plan Dive</em></a> - This feature allows the planning of dives.
 </p>
 </li>
 <li>
 <p>
-<a href="#S_Replan"><em>Re-plan dive</em></a> - Edit a dive plan that has been saved into the <strong>Dive List</strong>.
+<a href="#S_Replan"><em>Edit dive in planner</em></a> - Edit a dive plan that has been saved into the <strong>Dive List</strong>.
 </p>
 </li>
 <li>
@@ -4548,7 +5022,7 @@ dealing with the appropriate operations.</p></div>
 </li>
 <li>
 <p>
-<a href="#S_ViewPanels"><em>Info</em></a> - View only the <strong>Dive Notes</strong> panel.
+<a href="#S_ViewPanels"><em>Info</em></a> - View only the <strong>Notes</strong> panel.
 </p>
 </li>
 <li>
@@ -4564,7 +5038,8 @@ dealing with the appropriate operations.</p></div>
 </li>
 <li>
 <p>
-<em>Prev DC</em> - Switch to previous dive computer.
+<em>Prev DC</em> - If a single dive was logged from more than one dive computer, switch to data from
+   previous dive computer.
 </p>
 </li>
 <li>
@@ -4580,7 +5055,17 @@ dealing with the appropriate operations.</p></div>
 </ul></div>
 </div>
 <div class="sect2">
-<h3 id="_help">14.5. Help</h3>
+<h3 id="_share_on">14.5. Share on</h3>
+<div class="ulist"><ul>
+<li>
+<p>
+<a href="#S_Facebook"><em>Facebook</em></a> - Share the currently selected dive on your Facebook timeline.
+</p>
+</li>
+</ul></div>
+</div>
+<div class="sect2">
+<h3 id="_help">14.6. Help</h3>
 <div class="ulist"><ul>
 <li>
 <p>
@@ -4596,7 +5081,8 @@ dealing with the appropriate operations.</p></div>
 </li>
 <li>
 <p>
-<a href="#S_UserSurvey"><em>User survey</em></a>  - Help to make <em>Subsurface</em> even better by taking part in our user survey.
+<a href="#S_UserSurvey"><em>User survey</em></a>  - Help to make <em>Subsurface</em> even better by taking part in our user survey
+  or by completing another survey if your diving habits have changed.
 </p>
 </li>
 <li>
@@ -4620,7 +5106,7 @@ dealing with the appropriate operations.</p></div>
 </td>
 <td class="content">The operating system of the desktop computer needs the appropriate drivers in
 order to communicate with the dive computer in whichever way the dive
-computer prefers (e.g. bluetooth, USB, infra-red).</td>
+computer prefers (e.g. Bluetooth, USB, infra-red).</td>
 </tr></table>
 </div>
 <div class="ulist"><ul>
@@ -4757,13 +5243,13 @@ port, the dive computer interface can connect and one should be able to import
 dives.</p></div>
 </div>
 <div class="sect2">
-<h3 id="S_HowFindBluetoothDeviceName">15.3. Setting up bluetooth enabled devices</h3>
+<h3 id="S_HowFindBluetoothDeviceName">15.3. Manually setting up Bluetooth enabled devices</h3>
 <div class="admonitionblock">
 <table><tr>
 <td class="icon">
 <img src="images/icons/bluetooth.jpg" alt="Note" />
 </td>
-<td class="content">For dive computers communicating through bluetooth like the Heinrichs
+<td class="content">For dive computers communicating through Bluetooth like the Heinrichs
 Weikamp Frog or the Shearwater Predator and Petrel there is a
 different procedure to get the devices name to communicate with
 <em>Subsurface</em>. Follow these steps:</td>
@@ -4786,75 +5272,229 @@ manufacturer&#8217;s user guide. When using a Shearwater Predator/Petrel, select
 </p>
 </li>
 </ul></div>
-<div class="paragraph"><div class="title">On Windows:</div><p>Bluetooth is most likely already enabled. For pairing with the dive computer choose
+<div class="sect3">
+<h4 id="_on_windows_2">15.3.1. On Windows:</h4>
+<div class="paragraph"><p>Bluetooth is most likely already enabled. For pairing with the dive computer choose
 <em>Control Panel &#8594;  Bluetooth Devices &#8594;  Add Wireless Device</em>.
-This should bring up a dialog showing your dive computer (in Bluetooth mode) and
-allowing pairing. Right click on it and choose <em>Propertie s&#8594;  COM
+This should bring up a dialog showing your dive computer (which should be in Bluetooth mode) and
+allowing pairing. Right click on it and choose <em>Properties&#8594;  COM
 Ports</em> to identify the port used for your dive computer. If there are several
 ports listed, use the one saying "Outgoing" instead of "Incoming".</p></div>
 <div class="paragraph"><p>For downloading to <em>Subsurface</em>, the <em>Subsurface</em> drop-down list should contain
 this COM port already. If not, enter it manually.</p></div>
 <div class="paragraph"><p>Note: If there are issues afterwards when downloading from the dive computer using
 other software, remove the existing pairing with the dive computer.</p></div>
-<div class="paragraph"><div class="title">On MacOS:</div><p>Click on the Bluetooth symbol in the menu bar and select <em>Set up
+</div>
+<div class="sect3">
+<h4 id="_on_macos">15.3.2. On MacOS:</h4>
+<div class="paragraph"><p>Click on the Bluetooth symbol in the menu bar and select <em>Set up
 Bluetooth Device&#8230;</em>. The dive computer should then show up in the list of devices. Select it and go
 through the pairing process. This step should only be needed once for
 initial setup.</p></div>
 <div class="paragraph"><p>Once the pairing is completed the correct device is shown in the
 <em>Device or Mount Point</em> drop-down in the <em>Subsurface</em> <strong>Import</strong> dialog.</p></div>
-<div class="paragraph"><div class="title">On Linux</div><p>Ensure Bluetooth is enabled on the <em>Subsurface</em> computer.
+</div>
+<div class="sect3">
+<h4 id="_on_linux">15.3.3. On Linux</h4>
+<div class="paragraph"><p>Ensure Bluetooth is enabled on the <em>Subsurface</em> computer.
 On most common distributions this should be true out of the box and
 pairing should be straight forward. For instance, Gnome3 shows a
-Bluetooth icon in the upper right corner of the desktop where one selects <em>Set
-up New Device</em>. This should show a dialog where one can select the
-dive computer (which already should be in Bluetooth mode) and pair it.
-If a PIN is required, try manually setting <em>0000</em>.</p></div>
-<div class="paragraph"><p>In the rare cases where the above is not true, then
-depending on your system, try <code>initd</code> or <code>systemd</code>. This might be different
-and also involve loading modules specific to your hardware. In case your system
-is running <code>systemd</code>, manually run <code>systemctl start bluetooth.service</code> to
-enable it, in case of <code>initd</code>, run something like <code>rc.config start bluetoothd</code> or
-<code>/etc/init.d/bluetooth start</code>.</p></div>
-<div class="paragraph"><p>One may also use a manual approach by using such commands:</p></div>
+Bluetooth icon on the right of the toolbar at the top of the screen.
+Users have reported difficulties with some Bluetooth controllers.  If you have an onboard controller,
+try that first.  It is simplest if you remove any USB Bluetooth dongles.  If you have a USB dongle that
+came with your dive computer, try that before any others.</p></div>
+<div class="paragraph"><p>Setting up a connection to download dives from your Bluetooth-enabled device, such as the
+<em>Shearwater Petrel</em>, is not yet an automated process and will generally require the command prompt.
+It is essentially a three step process.</p></div>
+<div class="ulist"><ul>
+<li>
+<p>
+Enable the Bluetooth controller and pair your dive computer
+</p>
+</li>
+<li>
+<p>
+Establish an RFCOMM connection
+</p>
+</li>
+<li>
+<p>
+Download the dives with Subsurface
+</p>
+</li>
+</ul></div>
+<div class="paragraph"><p>Ensure the dive computer is in upload mode. On the <em>Shearwater Petrel</em> and <em>Petrel 2</em>,
+cycle through the menu, select <em>Dive Log</em>, then <em>Upload Log</em>.  The display will read <em>Initializing</em>, then
+<em>Wait PC 3:00</em> and will countdown.  Once the connection is established, the display reads <em>Wait CMD &#8230;</em>
+and the countdown continues. When downloading the dive from Subsurface, the display reads <em>Sending</em> then
+<em>Sent Dive</em>.</p></div>
+<div class="paragraph"><p>To establish the connection, establish root access through <code>sudo</code> or <code>su</code>.
+The correct permission is required to download the dives in the computer. On most Linux systems this means becoming
+a member of the dialout group (This is identical as for many dive computers using a Linux USB port, described
+in the previous section). On the command terminal, enter:</p></div>
+<div class="paragraph"><p><code>sudo usermod -a -G dialout username</code></p></div>
+<div class="paragraph"><p>Then log out and log in for the change to take effect.</p></div>
+<div class="sect4">
+<h5 id="_enabling_the_bluetooth_controller_and_pairing_your_dive_computer">Enabling the Bluetooth controller and pairing your dive computer</h5>
+<div class="paragraph"><p>Attempt to set up the Bluetooth controller and pair your dive computer using the graphical
+environment of the operating system. After setting the dive computer to upload mode, click the Bluetooth icon in the system tray
+and select <em>Add new device</em>. The dive computer should appear. If asked for a password, enter 0000.
+Write down or copy the MAC address of your dive computer - this needed later and should be in the form  00:11:22:33:44:55.</p></div>
+<div class="paragraph"><p>If the graphical method didn&#8217;t work, pair the device from the command line. Open a terminal
+and use <code>hciconfig</code> to check the Bluetooth controller status</p></div>
+<div class="literalblock">
+<div class="content">
+<pre><code>$ hciconfig
+hci0:   Type: BR/EDR  Bus: USB
+        BD Address: 01:23:45:67:89:AB  ACL MTU: 310:10  SCO MTU: 64:8
+        *DOWN*
+        RX bytes:504 acl:0 sco:0 events:22 errors:0
+        TX bytes:92 acl:0 sco:0 commands:21 errors:0</code></pre>
+</div></div>
+<div class="paragraph"><p>This indicates a Bluetooth controller with MAC address 01:23:45:67:89:AB, connected as hci0.
+Its status is <em>DOWN</em>, i.e. not powered.  Additional controllers will appear as hci1, etc.
+If there is not a Bluetooth dongle plugged in upon booting the computer, hci0 is probably the onboard.
+Now power on the controller and enable authentication:</p></div>
+<div class="literalblock">
+<div class="content">
+<pre><code>sudo hciconfig hci0 up auth+  (enter password when prompted)
+hciconfig
+hci0:  Type: BR/EDR  Bus: USB
+        BD Address: 01:23:45:67:89:AB  ACL MTU: 310:10  SCO MTU: 64:8
+        *UP RUNNING PSCAN AUTH*
+        RX bytes:1026 acl:0 sco:0 events:47 errors:0
+        TX bytes:449 acl:0 sco:0 commands:46 errors:0</code></pre>
+</div></div>
+<div class="paragraph"><p>Check that the status now includes <code><em>UP</em>, <em>RUNNING</em> AND <em>AUTH</em></code>.</p></div>
+<div class="paragraph"><p>If there are multiple controllers running, it&#8217;s easiest to off the unused controller(s). For example, for <code>hci1</code>:</p></div>
+<div class="literalblock">
+<div class="content">
+<pre><code>sudo hciconfig hci1 down</code></pre>
+</div></div>
+<div class="paragraph"><p>Next step is to <em>trust</em> and <em>pair</em> the dive computer. On distros with Bluez 5, such as Fedora 22,
+one can use a tool called <code>blutootctl</code>, which will bring up its own command prompt.</p></div>
+<div class="literalblock">
+<div class="content">
+<pre><code>bluetoothctl
+[NEW] Controller 01:23:45:67:89:AB localhost.localdomain [default]
+[bluetooth]# agent on
+Agent registered
+[bluetooth]# default-agent
+Default agent request successful
+[bluetooth]# scan on                        &lt;----now set your dive computer to upload mode
+Discovery started
+[CHG] Controller 01:23:45:67:89:AB Discovering: yes
+[NEW] Device 00:11:22:33:44:55 Petrel
+[bluetooth]# trust 00:11:22:33:44:55        &lt;----you can use the tab key to autocomplete the MAC address
+[CHG] Device 00:11:22:33:44:55 Trusted: yes
+Changing 00:11:22:33:44:55 trust succeeded
+[bluetooth]# pair 00:11:22:33:44:55
+Attempting to pair with 00:11:22:33:44:55
+[CHG] Device 00:11:22:33:44:55 Connected: yes
+[CHG] Device 00:11:22:33:44:55 UUIDs: 00001101-0000-1000-8000-0089abc12345
+[CHG] Device 00:11:22:33:44:55 Paired: yes
+Pairing successful
+[CHG] Device 00:11:22:33:44:55 Connected: no</code></pre>
+</div></div>
+<div class="paragraph"><p>If asked for a password, enter 0000. It&#8217;s ok if the last line says <em>Connected: no</em>. The important part
+is the line above, <code>Pairing successful</code>.</p></div>
+<div class="paragraph"><p>If the system has Bluez version 4 (e.g. Ubuntu 12.04 through to 15.04), there is probably not a
+<code>bluetoothctl</code>, but  a script called <code>bluez-simple-agent</code> or just <code>simple-agent</code>.</p></div>
+<div class="literalblock">
+<div class="content">
+<pre><code>hcitool -i hci0 scanning
+Scanning ...
+        00:11:22:33:44:55       Petrel
+        bluez-simple-agent hci0 00:11:22:33:44:55</code></pre>
+</div></div>
+<div class="paragraph"><p>Once ther dive computer is pired, set up the RFCOMM connection</p></div>
+</div>
+<div class="sect4">
+<h5 id="_establishing_the_rfcomm_connection">Establishing the RFCOMM connection</h5>
+<div class="paragraph"><p>The command to establish an RFCOMM connection is:</p></div>
+<div class="paragraph"><p><code>sudo rfcomm -i &lt;controller&gt; connect &lt;dev&gt; &lt;bdaddr&gt; [channel]</code></p></div>
 <div class="ulist"><ul>
 <li>
 <p>
-<code>hciconfig</code> shows the Bluetooth devices available on your
-   computer (not dive computer), most likely one will see a hci0, if not
-   try <code>hcitool -a</code> to see inactive devices and  run <code>sudo
-   hciconfig hci0 up</code> to bring them up.
+<code>&lt;controller&gt;</code> is the Bluetooth controller, <code>hci0</code>.
 </p>
 </li>
 <li>
 <p>
-<code>hcitool scanning</code> gets a list of bluetooth enabled
-   client devices, look for the dive computer and remember the MAC
-   address are shown there
+<code>&lt;dev&gt;</code> is the RFCOMM device file, <code>rfcomm0</code>
 </p>
 </li>
 <li>
 <p>
-<code>bluez-simple-agent hci0 10:00:E8:C4:BE:C4</code>  pairs
-   the dive computer with the bluetooth stack of the <em>Subsurface</em> computer, copy/paste
-   the MAC address from the output of <em>hcitool scanning</em>
+<code>&lt;bdaddr&gt;</code> is the dive computer&#8217;s MAC address, <code>00:11:22:33:44:55</code>
+</p>
+</li>
+<li>
+<p>
+<code>[channel]</code> is the dive computer&#8217;s Bluetooth channel we need to connect to.
 </p>
 </li>
 </ul></div>
-<div class="paragraph"><p>Unfortunately on Linux binding to a communication device has to be done
-manually by running:</p></div>
+<div class="paragraph"><p>If one omits it, channel 1 is assumed.  Based on a limited number of user reports,
+the appropriate channel for the dive computer is probably:</p></div>
 <div class="ulist"><ul>
 <li>
 <p>
-<code>rfcomm bind /dev/rfcomm0 10:00:E8:C4:BE:C4</code> binds the dive
-   computer to a communication device in the desktop computer, in case rfcomm is
-   already taken use rfcomm1 or up. IMPORTANT: Copy/paste the MAC address
-   from the output of <code>hcitool scanning</code>, the MAC address shown above will not
-   work.
+<em>Shearwater Petrel 2</em>: channel 5
+</p>
+</li>
+<li>
+<p>
+<em>Shearwater Petrel 1</em>: channel 1
+</p>
+</li>
+<li>
+<p>
+<em>Heinrichs-Weikamp OSTC Sport</em>: channel 1
 </p>
 </li>
 </ul></div>
-<div class="paragraph"><p>For downloading dives in <em>Subsurface</em> specify the device name connected to the MAC
-address in the last step above, e.g. <em>/dev/rfcomm0</em>.</p></div>
+<div class="paragraph"><p>E.g. to connect a <em>Shearwater Petrel 2</em>, set the dive computer to upload mode and enter:</p></div>
+<div class="literalblock">
+<div class="content">
+<pre><code>sudo rfcomm -i hci0 connect rfcomm0 00:11:22:33:44:55 5 (enter a password, probably 0000, when prompted)</code></pre>
+</div></div>
+<div class="paragraph"><p>This gives the response:</p></div>
+<div class="literalblock">
+<div class="content">
+<pre><code>Connected /dev/rfcomm0 to 00:11:22:33:44:55 on channel 5
+Press CTRL-C for hangup</code></pre>
+</div></div>
+<div class="paragraph"><p>To connect a _Shearwater Petrel 1+ or + HW OSTC Sport+, set the dive computer to upload mode and enter:</p></div>
+<div class="literalblock">
+<div class="content">
+<pre><code>sudo rfcomm -i hci0 connect rfcomm0 00:11:22:33:44:55   (enter a password, probably 0000, when prompted)
+Connected /dev/rfcomm0 to 00:11:22:33:44:55 on channel 1
+Press CTRL-C for hangup</code></pre>
+</div></div>
+<div class="paragraph"><p>If the specific channel the dive computer needs is not known, or the channel in the list above doesn&#8217;t
+work, the command <code>sdptool records</code> should help determine the appropriate channel. The output
+below is for a <em>Shearwater Petrel 2</em>.</p></div>
+<div class="literalblock">
+<div class="content">
+<pre><code>sdptool -i hci0 records 00:11:22:33:44:55
+Service Name: Serial Port
+Service RecHandle: 0x10000
+Service Class ID List:
+        "Serial Port" (0x1101)
+        Protocol Descriptor List:
+        "L2CAP" (0x0100)
+        "RFCOMM" (0x0003)
+        Channel: 5</code></pre>
+</div></div>
+<div class="paragraph"><p>For a Bluetooth dive computer not in the list above, or if the channel listed is not correct, please
+let the Subsurface developers know on the user forum or the developer mailing list <em>subsurface@subsurface-divelog.org</em>.</p></div>
+</div>
+<div class="sect4">
+<h5 id="_download_the_dives_with_subsurface">Download the dives with Subsurface</h5>
+<div class="paragraph"><p>After establishing the RFCOMM connection and while the dive computer&#8217;s upload mode countdown is still running, go to_Subsurface_, select <em>Import&#8594;Import from dive computer</em> and enter appropriate Vendor (e.g. <em>Shearwater</em>), Dive Computer (<em>Petrel</em>), Device or Mount Point (<em>/dev/rfcomm0</em>) and click <em>Download</em>.</p></div>
+</div>
+</div>
 </div>
 </div>
 </div>
@@ -4925,7 +5565,9 @@ from the console as follows:
 dive computer and download dive information.</p></div>
 <div class="paragraph"><p>Under Windows, a similar situation exists. Drivers for the MCS7780 are
 available from some Internet web sites e.g.
-<a href="http://www.drivers-download.com/Drv/MosChip/MCS7780/">www.drivers-download.com</a>.</p></div>
+<a href="http://www.drivers-download.com/Drv/MosChip/MCS7780/">www.drivers-download.com</a>. Windows-based IrDA
+drivers for the Uwatec can also be downloaded from the ScubaPro web site, drivers being located on
+the download page for the ScubaPro SmartTrak software.</p></div>
 <div class="paragraph"><p>For the Apple Mac, IrDA communication via the MCS7780 link is not
 available for OSX 10.6 or higher.</p></div>
 </div>
@@ -4965,38 +5607,15 @@ factors in the <em>Graph Settings</em> in <em>Subsurface</em> to generate a deco
 </div>
 </div>
 <div class="sect2">
-<h3 id="_importing_from_shearwater_predator_using_bluetooth">16.5. Importing from Shearwater Predator using Bluetooth</h3>
+<h3 id="_importing_from_shearwater_predator_petrel_using_bluetooth">16.5. Importing from Shearwater Predator/Petrel using Bluetooth</h3>
 <div class="admonitionblock">
 <table><tr>
 <td class="icon">
 <img src="images/icons/predator.jpg" alt="Note" />
 </td>
-<td class="content">Using a Shearwater Predator one may be able to pair Bluetooth but then encounter
-issues when downloading, showing errors like <em>Slip RX: unexp. SLIP END</em> on the
-Predator.
-This might also arise when using other dive log software and operating
-systems other than Linux. We have no detailed idea about the source and how to fix
-this, but it is reported to be solved sometimes by one of these steps:</td>
+<td class="content">Specific instructions for downloading dives using Bluetooth are  given in the section above, <a href="#S_Bluetooth"><em>Connecting Subsurface to a Bluetooth-enabled dive computer</em></a>.</td>
 </tr></table>
 </div>
-<div class="ulist"><ul>
-<li>
-<p>
-use the Bluetooth dongle which came with the Shearwater Predator instead of
-   the built-in one of the <em>Subsurface</em> computer
-</p>
-</li>
-<li>
-<p>
-switch to different Bluetooth drivers for the same hardware
-</p>
-</li>
-<li>
-<p>
-switch off WiFi while using Bluetooth
-</p>
-</li>
-</ul></div>
 </div>
 <div class="sect2">
 <h3 id="S_PoseidonMkVI">16.6. Importing from Poseidon MkVI Discovery</h3>
@@ -5035,7 +5654,7 @@ Redbook format dive log (file with .cvsr extension). This is a compressed
 <div class="paragraph"><p><em>Subsurface</em> accesses the .txt and the .csv files to obtain dive log information.</p></div>
 </div>
 <div class="sect2">
-<h3 id="_importing_from_apd_inspiration_ccr">16.7. Importing from APD Inspiration CCR</h3>
+<h3 id="_importing_from_apd_inspiration_evolution_ccr">16.7. Importing from APD Inspiration/Evolution CCR</h3>
 <div class="admonitionblock">
 <table><tr>
 <td class="icon">
@@ -5052,6 +5671,11 @@ APD inspiration dive logs are imported into <em>Subsurface</em> as follows:</td>
 <div class="ulist"><ul>
 <li>
 <p>
+Download the dive using <em>AP Communicator</em>.
+</p>
+</li>
+<li>
+<p>
 Open a dive within the <em>AP Log Viewer</em>.
 </p>
 </li>
@@ -5062,18 +5686,18 @@ Select the tab at the top of the screen, entitled "<em>Data</em>".
 </li>
 <li>
 <p>
-If the raw dive log data show on the screen, click on "<em>Copy to Clipboard</em>".
+With the raw dive log data show on the screen, click on "<em>Copy to Clipboard</em>".
 </p>
 </li>
 <li>
 <p>
-Open a text editor, e.g. Notepad (Windows), TextWrangler (Mac).
+Open a text editor, e.g. Notepad (Windows) or TextWrangler (Mac).
 </p>
 </li>
 <li>
 <p>
 Copy the contents of the clipboard into the text editor and save the text file
-  with a filename extension of .CSV
+  with a filename extension of <em>.apd</em>
 </p>
 </li>
 <li>
@@ -5083,28 +5707,43 @@ Within <em>Subsurface</em>, select <em>Import &#8594;  Import log files</em> to
 </li>
 <li>
 <p>
-In the dropdown list towards the bottom right of the dialogue, select "<em>CSV files</em>".
+In the dropdown list towards the bottom right of the dialogue (labled <em>Filter:</em>), select "APD log viewer".
 </p>
 </li>
 <li>
 <p>
-On the list of file names select the .CSV file that has been created above. An import
-  dialogue opens.
+On the list of file names select the <em>.apd</em> file that has been created above. An import
+  dialogue opens indicating the default settings for the data in the <em>.apd</em> file. If any changes are required,
+  do this as for <a href="#S_ImportingCSVDives">CSV imports</a>.
 </p>
 </li>
+</ul></div>
+<div class="imageblock" style="text-align:center;">
+<div class="content">
+<img src="images/APD_CSVimportF22.jpg" alt="Figure: APD log viewer import" />
+</div>
+</div>
+<div class="ulist"><ul>
 <li>
 <p>
-In the dropdown list on the top left labeled '<em>Pre-configured imports</em>",
-  select <em>APD Log Viewer</em>.
+The top left hand dropdown box in the import panel allows one to select the APD dive computer
+  for which the dive log needs to be imported. The default it is DC1, <em>i.e.</em> the
+  first of the two dive computers the APD uses. It is possible to sequentially
+  import the data for both dive computers by first importing CD1 and then DC2.(<strong>Hint</strong>: The logs
+  for the two dive computers are viewed by selecting <em>View  &#8594;  Next DC</em> from
+  the Main Menu after the uploading has been completed)
 </p>
 </li>
 <li>
 <p>
-Ensure the other settings for the ADP dive log are appropriate, then select <em>OK</em>.
+Click the <em>Ok</em> button at the bottom of the import panel.
 </p>
 </li>
 </ul></div>
-<div class="paragraph"><p>The APD dive log will appear within <em>Subsurface</em>.</p></div>
+<div class="paragraph"><p>The APD dive log will appear within <em>Subsurface</em>. The dive computer-generated ceiling
+generated by the Inspiration can be viewed by selecting the appropriate
+button on the left of the <strong>Dive Profile</strong>. Cylinder pressure data are not logged
+by the APD equipment but can be manually entered in the <em>Equipment</em> Tab.</p></div>
 </div>
 </div>
 </div>
@@ -5308,7 +5947,7 @@ The dives are now exported to the file DM4.bak (or DM5.bak)
 <div class="admonitionblock" id="Atomic_Export">
 <table><tr>
 <td class="icon">
-<img src="./images/icons/note.png" alt="Note" />
+<img src="images/icons/atomiclogo.jpg" alt="Note" />
 </td>
 <td class="content">Atomic Logbook is a Windows software by Atomic Aquatics. It allows
 downloading of dive information from Cobalt and Cobalt 2 dive computers.
@@ -5362,45 +6001,57 @@ The password for accessing the .zip file is <em>mares</em>.
 </ol></div>
 </div>
 <div class="sect2">
-<h3 id="S_ImportingDivingLog">17.4. Exporting from <strong>DivingLog 5.0</strong></h3>
+<h3 id="S_ImportingDivingLog">17.4. Exporting from <strong>DivingLog 5.0 and 6.0</strong></h3>
 <div class="admonitionblock">
 <table><tr>
 <td class="icon">
 <img src="images/icons/divingloglogo.jpg" alt="Note" />
 </td>
-<td class="content">Unfortunately DivingLog XML files give us no
-indication on the preferences set on one&#8217;s system. So in order for
-<em>Subsurface</em> to be able to successfully import XML files from DivingLog
-one first needs to ensure that DivingLog is configured
-to use the Metric system (one can easily change this within Diving Log by
-selecting <em>File &#8594;  Preferences &#8594; Units and Language</em> by clicking the <em>Metric</em>
-button). Then do the following:</td>
+<td class="content">The best way to bring your logs from DivingLog to Subsurface is to
+convert the whole database. This is because other export formats do not
+include all the details, and we would lack e.g. gas switches and
+information of what units are used. With database import, all this
+information is included and readily available for us.</td>
 </tr></table>
 </div>
+<div class="paragraph"><p>To transfer all files from DivingLog to Subsurface, do the following:</p></div>
 <div class="olist arabic"><ol class="arabic">
 <li>
 <p>
-In DivingLog open the <em>File &#8594;  Export &#8594;  XML</em> menu
+In DivingLog open the <em>File &#8594;  Export &#8594;  SQLite</em> menu
 </p>
 </li>
 <li>
 <p>
-Select the dives to export
+Select <em>Settings</em> button
 </p>
 </li>
 <li>
 <p>
-Click on the export button and select the filename
+Set the <em>RTF2Plaintext</em> to <em>true</em>
+</p>
+</li>
+<li>
+<p>
+Close the Settings dialog
+</p>
+</li>
+<li>
+<p>
+Click <em>Export</em> button and select the filename
 </p>
 </li>
 </ol></div>
+<div class="paragraph"><p>Once this is done, open the saved database file with Subsurface and the
+dives are automatically converted to our own format. Last step to do is
+save the log file in Subsurface.</p></div>
 </div>
 </div>
 </div>
 <div class="sect1">
-<h2 id="S_Appendix_D">18. APPENDIX D: Exporting a spreadsheet to CSV format</h2>
+<h2 id="_appendix_d_exporting_a_spreadsheet_to_csv_format">18. APPENDIX D: Exporting a spreadsheet to CSV format</h2>
 <div class="sectionbody">
-<div class="paragraph"><p>Many divers keep a diving log in some form of a digital file, commonly a spreadsheet
+<div class="paragraph" id="S_Appendix_D"><p>Many divers keep a diving log in some form of a digital file, commonly a spreadsheet
 with various fields of information. These logs can be easily imported into <em>Subsurface</em> after the
 spreadsheet is converted in a .CSV file.
 This section explains the procedure to convert a diving logbook stored in a spreadsheet
@@ -5531,10 +6182,341 @@ Click <em>OK</em> twice.
 </div>
 </div>
 <div class="sect1">
-<h2 id="_appendix_e_faqs">19. APPENDIX E: FAQs.</h2>
+<h2 id="S_APPENDIX_E">19. APPENDIX E: Writing a custom print template</h2>
 <div class="sectionbody">
+<div class="paragraph"><p><em>Subsurface</em> provides a mechanism to create or modify templates for printing dive logs in order to
+produce customised printouts of dive logs. Templates, written in HTML as well as a simple
+Grantlee instruction set, are rendered to the print device by <em>Subsurface</em>.</p></div>
+<div class="paragraph"><p>Templates are accessed using the print dialogue (see image <strong>B</strong> below).</p></div>
+<div class="imageblock" style="text-align:center;">
+<div class="content">
+<img src="images/Print1_f22.jpg" alt="FIGURE: Print dialogue" />
+</div>
+</div>
+<div class="paragraph"><p>The buttons under the <em>Template</em> dropdown box allows one to <em>Edit</em>, <em>Delete</em>,
+<em>Import</em> and to <em>Export</em> templates (see image <strong>A</strong> above). New or modified templates are stored as HTML
+files in the same directory as the dive log being processed. In order to create or modify
+a template, select one of the templates from the template dropdown list in the print dialogue
+(see image <strong>B</strong> above). Choose an existing template that resembles the final desired printout. Then select <em>Edit</em>.</p></div>
+<div class="paragraph"><p>The Edit Panel comprises three tabs:</p></div>
+<div class="imageblock" style="text-align:center;">
+<div class="content">
+<img src="images/Template1_f22.jpg" alt="FIGURE: template edit dialogue" />
+</div>
+</div>
+<div class="paragraph"><p>1) The <em>Style</em> tab (image <strong>A</strong> above) controls the font, line spacing and colour template used for printing the dive log.
+   The style attributes are editable. Choose one of the four colour palets used for colour printing.</p></div>
+<div class="paragraph"><p>2) The <em>Colors</em> tab (image <strong>B</strong> above) allows editing the colours used for printing the dive log. The colours are highly
+   customisable: the <em>Edit</em> buttons in the <em>Colors</em> tab allows choosing abritrary colours for different
+   components of the dive log printout.</p></div>
+<div class="paragraph"><p>3) The <em>Template</em> tab of the Edit Panel (see image below) allows creating a template using HTML as well as a few
+   Grantlee programming primitives. Grantlee provides the ability to create and format HTML code in
+   a highly simple but efficient way (see below). The HTML of the template can be edited and saved. The saved
+   template is stored in the same directory as the dive being processed. By default, a <em>Custom</em>
+   template is a skeleton with no specific print instructions. The informastion being printed
+   needs to be specified and formatted in the by replacing the section marked with:
+   "&lt;!-- Template must be filled -&#8594;". Writing HTML code with Grantlee instructions allows unlimited
+   freedom in determining what is printed an in which way it should be rendered.</p></div>
+<div class="imageblock" style="text-align:center;">
+<div class="content">
+<img src="images/Template2_f22.jpg" alt="FIGURE:Template tab" />
+</div>
+</div>
+<div class="paragraph"><p>One can adapt any of the existing templates and save it to the dive log directory. The standard templates (e.g. One dive, Six dives, Table) can be modified in this way. After completing the edits, use the <em>Export</em> button in the print
+dialogue to save the new template using a new template name.</p></div>
+<div class="paragraph"><p>To write a custom template the following elements must exist so that the template will be correctly handled and rendered.</p></div>
+<div class="sect2">
+<h3 id="_main_dive_loop">19.1. Main dive loop</h3>
+<div class="paragraph"><p><em>Subsurface</em> exports a dive list called (<strong>dives</strong>) to the <em>Grantlee</em> backend. It is possible to iterate over the list as follows:</p></div>
+<div class="literalblock">
+<div class="title">template.html</div>
+<div class="content">
+<pre><code>        {% for dive in dives %}
+                &lt;h1&gt; {{ dive.number }} &lt;/h1&gt;
+        {% endfor %}</code></pre>
+</div></div>
+<div class="literalblock">
+<div class="title">output.html</div>
+<div class="content">
+<pre><code>        &lt;h1&gt; 1 &lt;/h1&gt;
+        &lt;h1&gt; 2 &lt;/h1&gt;
+        &lt;h1&gt; 3 &lt;/h1&gt;</code></pre>
+</div></div>
+<div class="paragraph"><p>Additional information about <em>Grantlee</em> can be found <a href="http://www.grantlee.org/apidox/for_themers.html">here</a></p></div>
+</div>
 <div class="sect2">
-<h3 id="_subsurface_appears_to_miscalculate_gas_consumption_and_sac">19.1. Subsurface appears to miscalculate gas consumption and SAC</h3>
+<h3 id="_grantlee_exported_variables">19.2. Grantlee exported variables</h3>
+<div class="paragraph"><p>Only a subset of the dive data is exported:</p></div>
+<div class="tableblock">
+<table rules="all"
+width="100%"
+frame="border"
+cellspacing="0" cellpadding="4">
+<col width="50%" />
+<col width="50%" />
+<tbody>
+<tr>
+<td align="left" valign="top"><p class="table"><strong>Name</strong></p></td>
+<td align="left" valign="top"><p class="table"><strong>Description</strong></p></td>
+</tr>
+<tr>
+<td align="left" valign="top"><p class="table">number</p></td>
+<td align="left" valign="top"><p class="table">(<strong>int</strong>) dive number</p></td>
+</tr>
+<tr>
+<td align="left" valign="top"><p class="table">id</p></td>
+<td align="left" valign="top"><p class="table">(<strong>int</strong>) unique dive ID, should be used to fetch the dive profile</p></td>
+</tr>
+<tr>
+<td align="left" valign="top"><p class="table">date</p></td>
+<td align="left" valign="top"><p class="table">(<strong>string</strong>) data of the dive</p></td>
+</tr>
+<tr>
+<td align="left" valign="top"><p class="table">time</p></td>
+<td align="left" valign="top"><p class="table">(<strong>string</strong>) time of the dive</p></td>
+</tr>
+<tr>
+<td align="left" valign="top"><p class="table">location</p></td>
+<td align="left" valign="top"><p class="table">(<strong>string</strong>) location of the dive</p></td>
+</tr>
+<tr>
+<td align="left" valign="top"><p class="table">duration</p></td>
+<td align="left" valign="top"><p class="table">(<strong>string</strong>) duration of the dive</p></td>
+</tr>
+<tr>
+<td align="left" valign="top"><p class="table">depth</p></td>
+<td align="left" valign="top"><p class="table">(<strong>string</strong>) depth of the dive</p></td>
+</tr>
+<tr>
+<td align="left" valign="top"><p class="table">divemaster</p></td>
+<td align="left" valign="top"><p class="table">(<strong>string</strong>) divemaster data</p></td>
+</tr>
+<tr>
+<td align="left" valign="top"><p class="table">buddy</p></td>
+<td align="left" valign="top"><p class="table">(<strong>string</strong>) buddy data</p></td>
+</tr>
+<tr>
+<td align="left" valign="top"><p class="table">airTemp</p></td>
+<td align="left" valign="top"><p class="table">(<strong>string</strong>) air temperature of dive</p></td>
+</tr>
+<tr>
+<td align="left" valign="top"><p class="table">waterTemp</p></td>
+<td align="left" valign="top"><p class="table">(<strong>string</strong>) water temperature of dive</p></td>
+</tr>
+<tr>
+<td align="left" valign="top"><p class="table">notes</p></td>
+<td align="left" valign="top"><p class="table">(<strong>string</strong>) dive notes</p></td>
+</tr>
+<tr>
+<td align="left" valign="top"><p class="table">rating</p></td>
+<td align="left" valign="top"><p class="table">(<strong>int</strong>) dive rating ranges from 0 to 5</p></td>
+</tr>
+<tr>
+<td align="left" valign="top"><p class="table">sac</p></td>
+<td align="left" valign="top"><p class="table">(<strong>string</strong>) sac value</p></td>
+</tr>
+<tr>
+<td align="left" valign="top"><p class="table">tags</p></td>
+<td align="left" valign="top"><p class="table">(<strong>string</strong>) all dive tags concatenate together</p></td>
+</tr>
+<tr>
+<td align="left" valign="top"><p class="table">gas</p></td>
+<td align="left" valign="top"><p class="table">(<strong>string</strong>) used gas cylinder</p></td>
+</tr>
+</tbody>
+</table>
+</div>
+<div class="paragraph"><p><em>Subsurface</em> also exports <strong>template_options</strong> data. This data must be used as <em>CSS</em> values to provide a dynamically
+editable template. The exported data is shown in the following table:</p></div>
+<div class="tableblock">
+<table rules="all"
+width="100%"
+frame="border"
+cellspacing="0" cellpadding="4">
+<col width="50%" />
+<col width="50%" />
+<tbody>
+<tr>
+<td align="left" valign="top"><p class="table"><strong>Name</strong></p></td>
+<td align="left" valign="top"><p class="table"><strong>Description</strong></p></td>
+</tr>
+<tr>
+<td align="left" valign="top"><p class="table">font</p></td>
+<td align="left" valign="top"><p class="table">(<strong>string</strong>) font family</p></td>
+</tr>
+<tr>
+<td align="left" valign="top"><p class="table">borderwidth</p></td>
+<td align="left" valign="top"><p class="table">(<strong>int</strong>) border-width value dynamically calculated as 0.1% of the page width with minimum value of 1px</p></td>
+</tr>
+<tr>
+<td align="left" valign="top"><p class="table">font_size</p></td>
+<td align="left" valign="top"><p class="table">(<strong>double</strong>) size of fonts in vw, ranges between 1.0 and 2.0</p></td>
+</tr>
+<tr>
+<td align="left" valign="top"><p class="table">line_spacing</p></td>
+<td align="left" valign="top"><p class="table">(<strong>double</strong>) distance between text lines, ranges between 1.0 and 3.0</p></td>
+</tr>
+<tr>
+<td align="left" valign="top"><p class="table">color1</p></td>
+<td align="left" valign="top"><p class="table">(<strong>string</strong>) background color</p></td>
+</tr>
+<tr>
+<td align="left" valign="top"><p class="table">color2</p></td>
+<td align="left" valign="top"><p class="table">(<strong>string</strong>) primary table cell color</p></td>
+</tr>
+<tr>
+<td align="left" valign="top"><p class="table">color3</p></td>
+<td align="left" valign="top"><p class="table">(<strong>string</strong>) secondary table cell color</p></td>
+</tr>
+<tr>
+<td align="left" valign="top"><p class="table">color4</p></td>
+<td align="left" valign="top"><p class="table">(<strong>string</strong>) primary text color</p></td>
+</tr>
+<tr>
+<td align="left" valign="top"><p class="table">color5</p></td>
+<td align="left" valign="top"><p class="table">(<strong>string</strong>) secondary text color</p></td>
+</tr>
+<tr>
+<td align="left" valign="top"><p class="table">color6</p></td>
+<td align="left" valign="top"><p class="table">(<strong>string</strong>) border colors</p></td>
+</tr>
+</tbody>
+</table>
+</div>
+<div class="literalblock">
+<div class="title">template.html</div>
+<div class="content">
+<pre><code>        border-width: {{ template_options.borderwidth }}px;</code></pre>
+</div></div>
+<div class="literalblock">
+<div class="title">output.html</div>
+<div class="content">
+<pre><code>        border-width: 3px;</code></pre>
+</div></div>
+<div class="paragraph"><p>Another variable that <em>Subsurface</em> exports is <strong>print_options</strong>. This variable contains a single member:</p></div>
+<div class="tableblock">
+<table rules="all"
+width="100%"
+frame="border"
+cellspacing="0" cellpadding="4">
+<col width="50%" />
+<col width="50%" />
+<tbody>
+<tr>
+<td align="left" valign="top"><p class="table"><strong>Name</strong></p></td>
+<td align="left" valign="top"><p class="table"><strong>Description</strong></p></td>
+</tr>
+<tr>
+<td align="left" valign="top"><p class="table">grayscale</p></td>
+<td align="left" valign="top"><p class="table">Use <em>CSS</em> filters to convert the page into grayscale (should be added to body style to enable printing grayscale prints)</p></td>
+</tr>
+</tbody>
+</table>
+</div>
+<div class="literalblock">
+<div class="title">template.html</div>
+<div class="content">
+<pre><code>        body {
+                {{ print_options.grayscale }};
+        }</code></pre>
+</div></div>
+<div class="literalblock">
+<div class="title">output.html</div>
+<div class="content">
+<pre><code>        body {
+                -webkit-filter: grayscale(100%);
+        }</code></pre>
+</div></div>
+</div>
+<div class="sect2">
+<h3 id="_defined_css_selectors">19.3. Defined CSS selectors</h3>
+<div class="paragraph"><p>As the dive profile is placed after rendering, <em>Subsurface</em> uses a special <em>CSS</em> selectors to do some searches
+in the HTML output. The <em>CSS</em> selectors in the following table should be added.</p></div>
+<div class="tableblock">
+<table rules="all"
+width="100%"
+frame="border"
+cellspacing="0" cellpadding="4">
+<col width="33%" />
+<col width="33%" />
+<col width="33%" />
+<tbody>
+<tr>
+<td align="left" valign="top"><p class="table"><strong>Selector</strong></p></td>
+<td align="left" valign="top"><p class="table"><strong>Type</strong></p></td>
+<td align="left" valign="top"><p class="table"><strong>Description</strong></p></td>
+</tr>
+<tr>
+<td align="left" valign="top"><p class="table">dive_{{ dive.id }}</p></td>
+<td align="left" valign="top"><p class="table">id</p></td>
+<td align="left" valign="top"><p class="table">is used to fetch the relevant dive profile</p></td>
+</tr>
+<tr>
+<td align="left" valign="top"><p class="table">diveProfile</p></td>
+<td align="left" valign="top"><p class="table">class</p></td>
+<td align="left" valign="top"><p class="table">each div that will contain a dive profile should have this class selector in addition to the dive_{{ dive.id }} id selector</p></td>
+</tr>
+<tr>
+<td align="left" valign="top"><p class="table">dontbreak</p></td>
+<td align="left" valign="top"><p class="table">class</p></td>
+<td align="left" valign="top"><p class="table">prevents the div with this class to be divided into two pages, this can be used
+in flow layout templates only (when data-numberofdives = 0)</p></td>
+</tr>
+</tbody>
+</table>
+</div>
+<div class="admonitionblock">
+<table><tr>
+<td class="icon">
+<img src="./images/icons/important.png" alt="Important" />
+</td>
+<td class="content">Rendering dive profiles is not supported for flow layout templates (when data-numberofdives = 0).</td>
+</tr></table>
+</div>
+</div>
+<div class="sect2">
+<h3 id="_special_attributes">19.4. Special attributes</h3>
+<div class="paragraph"><p>There are two ways of rendering- either rendering a specific number of dives in each page or make <em>Subsurface</em> try to
+fit as much dives as possible into one page (<em>flow</em> rendering).</p></div>
+<div class="paragraph"><p>The <strong>data-numberofdives</strong> data attribute is added to the body tag to set the rendering mode</p></div>
+<div class="ulist"><ul>
+<li>
+<p>
+render 6 dives per page:
+</p>
+</li>
+</ul></div>
+<div class="literalblock">
+<div class="content">
+<pre><code>        &lt;body data-numberofdives = 6&gt;</code></pre>
+</div></div>
+<div class="ulist"><ul>
+<li>
+<p>
+render as much dives as possible:
+</p>
+</li>
+</ul></div>
+<div class="literalblock">
+<div class="content">
+<pre><code>        &lt;body data-numberofdives = 0&gt;</code></pre>
+</div></div>
+<div class="admonitionblock">
+<table><tr>
+<td class="icon">
+<img src="./images/icons/important.png" alt="Important" />
+</td>
+<td class="content">All CSS units should be in relative lengths only, to support printing on any page size.</td>
+</tr></table>
+</div>
+</div>
+</div>
+</div>
+<div class="sect1">
+<h2 id="_appendix_f_faqs">20. APPENDIX F: FAQs.</h2>
+<div class="sectionbody">
+<div class="sect2">
+<h3 id="S_APPENDIX_F">20.1. Subsurface appears to miscalculate gas consumption and SAC</h3>
 <div class="paragraph" id="SAC_CALCULATION"><p><em>Question</em>: I dived with a 12.2 l tank, starting with 220 bar and ending with 100 bar, and I calculate a different SAC compared what <em>Subsurface</em> calculates. Is <em>Subsurface</em>
 miscalculating?</p></div>
 <div class="paragraph"><p><em>Answer</em>: Not really. What happens is that <em>Subsurface</em> actually calculates gas
@@ -5565,7 +6547,7 @@ starts becoming much more noticeable at high pressure. A 400 bar really does not
 contain twice as much air as a 200 bar one. At lower pressures, air acts pretty much like an ideal gas.</p></div>
 </div>
 <div class="sect2">
-<h3 id="_some_dive_profiles_have_time_discrepancies_with_the_recorded_samples_from_my_dive_computer_8230">19.2. Some dive profiles have time discrepancies with the recorded samples from my dive computer&#8230;</h3>
+<h3 id="_some_dive_profiles_have_time_discrepancies_with_the_recorded_samples_from_my_dive_computer_8230">20.2. Some dive profiles have time discrepancies with the recorded samples from my dive computer&#8230;</h3>
 <div class="paragraph"><p><em>Subsurface</em> ends up ignoring surface time for many things (average depth, divetime, SAC, etc).
 <em>Question</em>:  Why do dive durations in my dive computer differ from that given by <em>Subsurface</em>?</p></div>
 <div class="paragraph"><p><em>Answer</em>: For example, if you end up doing a weight check (deep enough to trigger the "dive started")
@@ -5576,13 +6558,31 @@ It&#8217;s even more noticeable if you do things like divemastering the initial
 you may stay in the water for a long time, but spend most of it at the surface. And then
 you don&#8217;t want that to count as some kind of long dive”.</p></div>
 </div>
+<div class="sect2">
+<h3 id="_some_dive_profiles_are_missing_from_the_download">20.3. Some dive profiles are missing from the download</h3>
+<div class="paragraph" id="DC_HISTORY"><p><em>Question</em>: I cannot download all my dives, only the most recent ones
+even though my dive computer&#8217;s manual states that it records history of
+e.g. 999 dives.</p></div>
+<div class="paragraph"><p><em>Answer</em>: Dive history is different than the dive profiles on the log.
+The history only keeps track of the total number of dives and total
+amount of time spent below surface. The logs, on the other hand, store
+the dive profile, but they have limited amount of memory to do so. The
+exact amount of dive profiles that can be stored on the device depend on
+sample interval and duration of the dives. Once the memory is full the
+oldest dives get overwritten with new dives. Thus we are only able to
+download the last 13, 30 or 199 dives.</p></div>
+<div class="paragraph"><p>If you have downloaded your dives to different dive logging software
+before they were overwritten, there is a high chance that Subsurface can
+import these. However, if the logs are only on your dive computer, they
+cannot be salvaged after being over written by new dives.</p></div>
+</div>
 </div>
 </div>
 </div>
 <div id="footnotes"><hr /></div>
 <div id="footer">
 <div id="footer-text">
-Last updated 2015-02-17 08:49:01 PST
+Last updated 2015-10-13 08:46:54 PDT
 </div>
 </div>
 </body>
author	Dirk Hohndel <dirk@hohndel.org>	2015-10-13 13:19:27 -0700
committer	Dirk Hohndel <dirk@hohndel.org>	2015-10-13 13:19:27 -0700
commit	c7c686f730a0480483452152c8e0e5efe3257c91 (patch)
tree	377582213eb6c9d1bec205215fb0cc14b8fc3a18 /Documentation/user-manual.html.git
parent	409df339b82b67cf4ecf0963f2aa3ca2dc2cf079 (diff)
download	subsurface-c7c686f730a0480483452152c8e0e5efe3257c91.tar.gz