Update to pre-built user manualsv4.4.0

And disable Russian manual for the moment - it's too old

Signed-off-by: Dirk Hohndel <dirk@hohndel.org>

1 files changed, 1495 insertions, 788 deletions

diff --git a/Documentation/user-manual.html.git b/Documentation/user-manual.html.git
index 3dfa3188f..2e0c1d0fa 100644
--- a/Documentation/user-manual.html.git
+++ b/Documentation/user-manual.html.git
@@ -404,13 +404,13 @@ asciidoc.install(3);
 <div id="content">

 <div class="imageblock" style="text-align:center;">

 <div class="content">

-<img src="images/Subsurface4Banner.png" alt="Banner" />

+<img src="images/Subsurface4Banner.jpg" alt="Banner" />

 </div>

 </div>

 <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</p></div>

-<div class="paragraph"><p><span class="blue"><em>Version 4.2,  August 2014</em></span></p></div>

+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>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

@@ -418,10 +418,16 @@ software solutions:</p></div>
 <div class="ulist"><ul>

 <li>

 <p>

+Do you need a flexible way of logging dives using recreational equipment,

+   even not using a dive computer?

+</p>

+</li>

+<li>

+<p>

 Do you use two different dive computer brands, each with its own proprietary

    software for downloading dive logs? Do you dive with rebreathers as well

-   as open circuit? Do you use a Reefnet Sensus time-depth recorder

-   in conjunction with a dive computer? <em>Subsurface</em> offers a standard

+   as open circuit or recreational equipment? Do you use a Reefnet Sensus time-depth

+   recorder in conjunction with a dive computer? <em>Subsurface</em> offers a standard

    interface for downloading dive logs from all these different pieces of

    equipment and to store and analyse the dive logs within a unified system.

 </p>

@@ -430,14 +436,20 @@ Do you use two different dive computer brands, each with its own proprietary
 <p>

 Do you use more than one operating system? <em>Subsurface</em> is fully compatible

    with Mac, Linux and Windows, allowing you to access your dive log on each

-   of your operating systems with a single application.

+   of your operating systems using a single application.

 </p>

 </li>

 <li>

 <p>

 Do you use Linux or Mac and your dive computer has only Windows-based software

    for downloading dive information (e.g. Mares)? <em>Subsurface</em> provides a way of

-   storing and analysing your dive logs on other operating systems.

+   downloading and analysing your dive logs on other operating systems.

+</p>

+</li>

+<li>

+<p>

+Do you need an intuitive graphical dive planner that integrates with and takes

+   into account the dives that have already been logged?

 </p>

 </li>

 </ul></div>

@@ -460,7 +472,16 @@ Divers</p></div>
   <noscript><p><b>JavaScript must be enabled in your browser to display the table of contents.</b></p></noscript>

 </div>

 <div class="sect1">

-<h2 id="S_UserSurvey">1. The user survey</h2>

+<h2 id="S_UserSurvey">1. Using this manual</h2>

+<div class="sectionbody">

+<div class="paragraph"><p>When opened from within <em>Subsurface</em>, this manual does not have external controls. However,

+a <em>SEARCH</em> function is important. This is activated by pressing control-F or command-F on

+the keyboard. A text box appears at the bottom of the window. Use this to search for

+any term in the manual.</p></div>

+</div>

+</div>

+<div class="sect1">

+<h2 id="_the_user_survey">2. The user survey</h2>

 <div class="sectionbody">

 <div class="paragraph"><p>In order to develop <em>Subsurface</em> in a way that serves its users in the best possible way,

 it is important to have some user information. Upon launching <em>Subsurface</em>

@@ -476,7 +497,7 @@ command line.</p></div>
 </div>

 </div>

 <div class="sect1">

-<h2 id="S_StartUsing">2. Start Using the Program</h2>

+<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

@@ -525,7 +546,7 @@ of the <strong>Dive Info</strong> panel (maximum, minimum and average depths, du
 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.jpg" alt="The Main Window" />

+<img src="images/main_window_f20.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

@@ -548,51 +569,70 @@ following sections, the procedures to create a new logbook will be described.</p
 </div>

 </div>

 <div class="sect1">

-<h2 id="S_NewLogbook">3. Creating a new logbook</h2>

+<h2 id="S_NewLogbook">4. Creating a new logbook</h2>

 <div class="sectionbody">

-<div class="paragraph"><p>Select <em>File &#8594; New Logbook</em> from the main menu. All existing dive data are

+<div class="paragraph"><p>Select <em>File &#8594;  New Logbook</em> from the main menu. All existing dive data are

 cleared so that new information can be added. If there are unsaved data in an

 open logbook, the user is asked whether the open logbook should be

 saved before a new logbook is created.</p></div>

 </div>

 </div>

 <div class="sect1">

-<h2 id="S_GetInformation">4. How to store dive information in the user&#8217;s logbook</h2>

+<h2 id="S_GetInformation">5. Storing dive information in the logbook</h2>

 <div class="sectionbody">

-<div class="paragraph"><p>There are several ways in which dive information can be added to a logbook:</p></div>

-<div class="olist arabic"><ol class="arabic">

+<div class="paragraph"><p>Now that a new logbook was created, it is simple to add dive data to it.

+<em>Subsurface</em> allows several ways of adding dive data to a logbook, detailed

+in the following sections.</p></div>

+<div class="paragraph"><p>1) If the user has a handwritten divelog, a spreadsheet or another form of

+ manually maintained divelog, dive data can be added to the logbook using

+ one of these approaches:</p></div>

+<div class="ulist"><ul>

 <li>

 <p>

-Enter dive information by hand. This is typically useful if the diver did not

-use a dive computer and dives were recorded in a written logbook.

+Enter dive information by hand. This is useful if the diver did not

+ use a dive computer and dives were recorded in a written logbook. See:

+ <a href="#S_EnterData">Entering dive information by hand</a>

 </p>

 </li>

 <li>

 <p>

-Import dive information directly from a dive computer if it is supported by

-<em>Subsurface</em>. The latest list of dive computers supported by <em>Subsurface</em> can

-be found at:

-<a href="http://subsurface-divelog.org/documentation/supported-dive-computers/">

-Supported dive computers</a>.

+Import dive log information that has been maintained either as a spreadsheet

+ or as a CSV file. Refer to: <a href="#S_Appendix_D">APPENDIX D: Exporting a spreadsheet to CSV format</a> and

+ to <a href="#S_ImportingCSVDives">Importing dives in CSV format</a>.

 </p>

 </li>

+</ul></div>

+<div class="paragraph"><p>2) If one has dives recorded using a dive computer, the depth profile of the

+ dive and a large amount of additional information can be accessed. These dives

+ can be imported from:</p></div>

+<div class="ulist"><ul>

 <li>

 <p>

-Import dive information from another database or file format. If you

-have kept your dive logs with other log software, these logs can often

-be imported to subsurface. This is discussed in more detail below.

+The divecomputer itself. See: <a href="#S_ImportDiveComputer">Importing new dive information from a Dive Computer</a> or

 </p>

 </li>

-</ol></div>

+<li>

+<p>

+Proprietary software distributed by manufacturers of dive computers. Refer

+ to: <a href="#S_ImportingAlienDiveLogs">Importing dive information from other digital data sources or other data formats</a>.

+</p>

+</li>

+<li>

+<p>

+Import from spreadsheet or CSV files containing dive profiles.

+ See: <a href="#S_ImportingCSVDives">Importing dives in CSV format from dive computers or other dive log software</a>

+</p>

+</li>

+</ul></div>

 <div class="sect2">

-<h3 id="S_EnterData">4.1. Entering dive information by hand</h3>

+<h3 id="S_EnterData">5.1. Entering dive information by hand</h3>

 <div class="paragraph"><p>This is usually the approach for dives without a dive computer. The basic record

 of information within <em>Subsurface</em> is a dive. The most important information

 in a simple dive logbook usually includes dive type, date, time, duration,

 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

+&#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

 <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

@@ -600,21 +640,31 @@ of each dive. These panels are respectively marked <span class="red">A</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.jpg" alt="FIGURE: Add dive" />

+<img src="images/AddDive1_f20.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. This message is

+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="imageblock" style="text-align:center;">

+<div class="content">

+<img src="images/BlueEditBar_f20.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.

+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

+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">4.1.1. Dive Notes</h4>

+<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.jpg" alt="FIGURE: The Dive Notes tab" />

+<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

@@ -640,25 +690,25 @@ here. These can come from three sources:</p></div>
 <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.

+   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 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>

+   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:

+   four formats with latitude followed by longitude:

 </p>

 <div class="literalblock">

 <div class="content">

@@ -677,6 +727,10 @@ 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

@@ -705,12 +759,12 @@ 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.jpg" alt="FIGURE: A completed Dive Notes tab" />

+<img src="images/CompletedDiveInfo_f20.jpg" alt="FIGURE: A completed Dive Notes tab" />

 </div>

 </div>

 </div>

 <div class="sect3">

-<h4 id="_equipment">4.1.2. Equipment</h4>

+<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

@@ -720,7 +774,7 @@ cylinders and gases (entered here) affects the behaviour of the dive profile
 like this:</p></div>

 <div class="imageblock" style="text-align:center;">

 <div class="content">

-<img src="images/Gas_dialogue1.jpg" alt="FIGURE:Initial cylinder dialogue" />

+<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

@@ -735,7 +789,7 @@ 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.jpg" alt="FIGURE:The cylinder drop-down list button" />

+<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

@@ -760,7 +814,7 @@ 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.jpg" alt="FIGURE: a completed cylinder dive information table" />

+<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

@@ -769,14 +823,14 @@ 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.jpg" alt="FIGURE: The Weights dialogue" />

+<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.jpg" alt="FIGURE: Weights type drop-down list button" />

+<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

@@ -793,14 +847,14 @@ 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.jpg" alt="FIGURE: A completed weights information table" />

+<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">4.1.3. Creating a Dive Profile</h4>

+<h4 id="S_CreateProfile">5.1.3. 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>

@@ -808,7 +862,7 @@ presents a default dive profile that needs to be modified to best represent the
 dive being described:</p></div>

 <div class="imageblock" style="text-align:center;">

 <div class="content">

-<img src="images/DiveProfile1.jpg" alt="FIGURE: Initial dive profile" />

+<img src="images/DiveProfile1_f20.jpg" alt="FIGURE: Initial dive profile" />

 </div>

 </div>

 <div class="paragraph"><p><em>Modifying the dive profile</em>: When the cursor is moved around the dive profile,

@@ -829,7 +883,7 @@ time duration for the dive. Below is a dive profile that represents 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">

-<img src="images/DiveProfile2.jpg" alt="FIGURE: Edited dive profile" />

+<img src="images/DiveProfile2_f20.jpg" alt="FIGURE: Edited dive profile" />

 </div>

 </div>

 <div class="paragraph"><p><em>Specifying the gas composition:</em> The gas composition used is clearly indicated

@@ -844,20 +898,20 @@ waypoint. Note that only the gases defined in the <strong>Equipment</strong> tab
 context menu.</p></div>

 <div class="imageblock" style="text-align:center;">

 <div class="content">

-<img src="images/DiveProfile3.jpg" alt="FIGURE: Gas composition context menu" />

+<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 20 m for 30 min and with a switch from air to

+<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.jpg" alt="FIGURE: Completed dive profile" />

+<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">4.1.4. Saving the hand-entered dive information</h4>

+<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

@@ -870,9 +924,9 @@ once more to save the logbook with the new dive(s).</p></div>
 </div>

 </div>

 <div class="sect2">

-<h3 id="S_ImportDiveComputer">4.2. Importing new dive information from a Dive Computer</h3>

+<h3 id="S_ImportDiveComputer">5.2. Importing new dive information from a Dive Computer</h3>

 <div class="sect3">

-<h4 id="_connecting_and_importing_data_from_a_dive_computer">4.2.1. Connecting and importing data from a dive computer.</h4>

+<h4 id="_connecting_and_importing_data_from_a_dive_computer">5.2.1. Connecting and importing data from a dive computer.</h4>

 <div class="paragraph"><p>The use of dive computers allows the collection of a large amount of

 information about

 each dive, e.g. a detailed record of depth, duration, rates of ascent/descent

@@ -930,19 +984,20 @@ The dive computer should be placed into PC Communication mode.
 </li>

 <li>

 <p>

-In <em>Subsurface</em>, from the Main Menu, the user must select <em>Import &#8594; Import

-From Dive Computer</em>.

-Dialogue <strong>A</strong> in the figure below appears:

+In <em>Subsurface</em>, from the Main Menu, the user must select <em>Import &#8594;  Import

+   From Dive Computer</em>.

+   Dialogue <strong>A</strong> in the figure below appears:

 </p>

 </li>

 </ol></div>

 <div class="imageblock" style="text-align:center;">

 <div class="content">

-<img src="images/ImportFromDC1.jpg" alt="FIGURE: Download dialogue 1" />

+<img src="images/DC_import_f20.jpg" alt="FIGURE: Download dialogue 1" />

 </div>

 </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

+though these dives have already been imported to <em>Subsurface</em>. For that reason, if

+the divecomputer 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).

@@ -953,25 +1008,25 @@ even though some may already be in the logbook, then check the check box labelle
 <li>

 <p>

 The dialogue has two drop-down lists, <strong>Vendor</strong> and <strong>Dive Computer</strong>. On the

-<strong>vendor</strong> drop-down list select the make of the computer, e.g.

-Suunto, Oceanic,

-Uwatec, Mares. On the <strong>Dive Computer</strong> drop-down list, the model name of

-the dive computer must be selected, e.g. D4 (Suunto), Veo200 (Oceanic), or Puck

-(Mares).

+   <strong>vendor</strong> drop-down list select the make of the computer, e.g.

+   Suunto, Oceanic,

+   Uwatec, Mares. On the <strong>Dive Computer</strong> drop-down list, the model name of

+   the dive computer must be selected, e.g. D4 (Suunto), Veo200 (Oceanic), or Puck

+   (Mares).

 </p>

 </li>

 <li>

 <p>

 The <strong>Device or Mount Point</strong> drop-down list contains the USB or Bluetooth port

-name that <em>Subsurface</em> needs in order to communicate with the dive computer.

-The appropriate port name must be selected. Consult

-<a href="#_appendix_a_operating_system_specific_information_for_importing_dive_information_from_a_dive_computer">Appendix A</a>

-and

-<a href="#_appendix_b_dive_computer_specific_information_for_importing_dive_information">Appendix B</a>

-for technical details on how to find the appropriate port information for a

-particular dive

-computer and, in some cases, how to do the correct settings to the operating

-system of the computer on which <em>Subsurface</em> is running.

+   name that <em>Subsurface</em> needs in order to communicate with the dive computer.

+   The appropriate port name must be selected. Consult

+   <a href="#_appendix_a_operating_system_specific_information_for_importing_dive_information_from_a_dive_computer">Appendix A</a>

+   and

+   <a href="#_appendix_b_dive_computer_specific_information_for_importing_dive_information">Appendix B</a>

+   for technical details on how to find the appropriate port information for a

+   particular dive

+   computer and, in some cases, how to do the correct settings to the operating

+   system of the computer on which <em>Subsurface</em> is running.

 </p>

 </li>

 <li>

@@ -992,46 +1047,61 @@ If all the dives on the dive computer need to be downloaded, check the
 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 record in the <em>Subsurface</em> divelog will be overwritten

-   by the record from the dive computer

+   <strong>Dive List</strong> panel, the dive in the <em>Subsurface</em> divelog will be overwritten

+   by the dive record from the dive computer

+</p>

+</li>

+<li>

+<p>

+The checkbox marked <em>Download into new trip</em> ensures that, after upload, the downloaded dives

+   are grouped together as a new trip(s) in the <strong>Dive List</strong>.

 </p>

 </li>

 <li>

 <p>

 Do <strong>not</strong> check the checkboxes labelled <em>Save libdivecomputer logfile</em> and

-    <em>Save libdivecomputer dumpfile</em>. These are only used as diagnostic tools

-    when problems with downloads are experienced (see below).

+   <em>Save libdivecomputer dumpfile</em>. These are only used as diagnostic tools

+   when problems with downloads are experienced (see below).

 </p>

 </li>

 <li>

 <p>

-The <em>OK</em> button must then be clicked. Dialogue <strong>B</strong> in the figure above

-appears.

+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

-retrieved from the dive computer.

-Depending on the make of the dive computer and/or number of recorded dives, this

-could take some time. The user should 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

-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.

+   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

+   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>

+<div class="ulist"><ul>

 <li>

 <p>

 If there is a problem in communicating with the dive computer, an error

-message will be shown, similar to this text: "Unable to open /dev/ttyUSB0 Mares

-(Puck Pro)". Refer to the text in the box below.

+   message will be shown, similar to this text: "Unable to open /dev/ttyUSB0 Mares

+   (Puck Pro)". Refer to the text in the box below.

 </p>

 </li>

 </ul></div>

@@ -1050,35 +1120,35 @@ message will be shown, similar to this text: "Unable to open /dev/ttyUSB0 Mares
 <li>

 <p>

 Is the dive computer still in PC-communication or

-Upload mode?

+   Upload mode?

 </p>

 </li>

 <li>

 <p>

 Is the battery of the dive computer fully charged? If not then the battery

-must be charged or replaced.

+   must be charged or replaced.

 </p>

 </li>

 <li>

 <p>

 Is the connecting cable faulty? Does the cable work perfectly using other

-software? Has it worked before, or is this the first time the cable is being used? Are the contacts

-on the dive computer and the cable clean?

+   software? Has it worked before, or is this the first time the cable is being used? Are the contacts

+   on the dive computer and the cable clean?

 </p>

 </li>

 <li>

 <p>

 Consult

-<a href="#_appendix_a_operating_system_specific_information_for_importing_dive_information_from_a_dive_computer">Appendix A</a>

-and make sure that the correct Mount Point

-was specified (see above).

+   <a href="#_appendix_a_operating_system_specific_information_for_importing_dive_information_from_a_dive_computer">Appendix A</a>

+   and make sure that the correct Mount Point

+   was specified (see above).

 </p>

 </li>

 <li>

 <p>

 On Unix-like operating systems, does the user have write permission to the

-USB port? If not, consult

-<a href="#_appendix_a_operating_system_specific_information_for_importing_dive_information_from_a_dive_computer">Appendix A</a>

+   USB port? If not, consult

+   <a href="#_appendix_a_operating_system_specific_information_for_importing_dive_information_from_a_dive_computer">Appendix A</a>

 </p>

 </li>

 </ul></div>

@@ -1115,7 +1185,7 @@ as well as contextual information about the dives recorded on the dive computer.
 </div></div>

 </div>

 <div class="sect3">

-<h4 id="S_DeviceNames">4.2.2. Changing the name of a dive computer</h4>

+<h4 id="S_DeviceNames">5.2.2. 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

@@ -1125,32 +1195,33 @@ one would perhaps like to call one dc "Alice&#8217;s Suunto D4" and the other on
 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>.

-On the <strong>Main Menu</strong>, select <em>Log &#8594; Edit device names</em>. A dialog opens, indicating the

+On the <strong>Main Menu</strong>, select <em>Log &#8594;  Edit device names</em>. A dialog opens, indicating the

 current Model, ID and Nickname of the dive computers used for upload. Edit the Nickname

 field for the appropriate dive computer. After saving the Nickname, the dive logs

 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">4.2.3. Updating the dive information imported from the dive computer.</h4>

-<div class="paragraph"><p>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,

+<h4 id="S_EditDiveInfo">5.2.3. 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

 <em>Subsurface</em> window should be used.</p></div>

 </div>

 <div class="sect3">

-<h4 id="_dive_notes_2">4.2.4. Dive Notes</h4>

-<div class="paragraph"><p>The date and time of the dive, gas mixture and (often) water temperature is

-shown as obtained from the dive computer, but the user needs to add some

-additional information by hand in order to have a more complete dive record.

+<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

 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>

 <div class="imageblock" style="text-align:center;">

 <div class="content">

-<img src="images/AddDive3.jpg" alt="FIGURE: The Dive Notes tab" />

+<img src="images/AddDive3_f20.jpg" alt="FIGURE: The Dive Notes tab" />

 </div>

 </div>

 <div class="paragraph"><p>The <strong>Time</strong> field reflects the date and time of the dive. By clicking

@@ -1179,25 +1250,25 @@ here. These can come from three sources:</p></div>
 <li>

 <p>

 The user 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

-stored.

+   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

+   stored.

 </p>

 </li>

 <li>

 <p>

 The user can obtain the coordinates from the <em>Subsurface</em> Companion app if

-an Android device with GPS was used and if the coordinates of the dive site

-were stored using that device.

-<a href="#S_Companion">Click here for more information</a>

+   an Android or iPhone device with GPS was used 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:

+   four formats with latitude followed by longitude:

 </p>

 <div class="literalblock">

 <div class="content">

@@ -1216,6 +1287,10 @@ 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 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

@@ -1248,18 +1323,18 @@ 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.jpg" alt="FIGURE: A completed Dive Notes tab" />

+<img src="images/CompletedDiveInfo_f20.jpg" alt="FIGURE: A completed Dive Notes tab" />

 </div>

 </div>

 </div>

 <div class="sect3">

-<h4 id="_equipment_2">4.2.5. Equipment</h4>

+<h4 id="_equipment_2">5.2.5. Equipment</h4>

 <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.jpg" alt="FIGURE: Blue edit bar" />

+<img src="images/BlueEditBar_f20.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

@@ -1270,7 +1345,7 @@ cylinders and gases (entered here) determines the behaviour of the dive profile
 like this:</p></div>

 <div class="imageblock" style="text-align:center;">

 <div class="content">

-<img src="images/DC_gas_dialogue1.jpg" alt="FIGURE: Initial cylinder dialogue" />

+<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

@@ -1285,7 +1360,7 @@ 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;">

 <div class="content">

-<img src="images/DC_gas_dialogue2.jpg" alt="FIGURE: The cylinder drop-down list button" />

+<img src="images/DC_gas-dialogue2_f20.jpg" alt="FIGURE: The cylinder drop-down list button" />

 </div>

 </div>

 <div class="paragraph"><p>The drop-down list can then be used to select the cylinder type that was used

@@ -1308,7 +1383,7 @@ 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>

 <div class="imageblock" style="text-align:center;">

 <div class="content">

-<img src="images/CylinderDataEntry3.jpg" alt="FIGURE: a completed cylinder dive information table" />

+<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 can be entered

@@ -1318,14 +1393,14 @@ 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.jpg" alt="FIGURE:The Weights dialogue" />

+<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

 down-arrow:</p></div>

 <div class="imageblock" style="text-align:center;">

 <div class="content">

-<img src="images/WeightsDataEntry2.jpg" alt="FIGURE:Weights type drop-down list button" />

+<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

@@ -1343,12 +1418,12 @@ the dustbin icon on the left hand. Here is an example of information for a dive
 with two types of weights: integrated as well as a weight belt:</p></div>

 <div class="imageblock" style="text-align:center;">

 <div class="content">

-<img src="images/WeightsDataEntry3.jpg" alt="FIGURE: A completed weights information table" />

+<img src="images/WeightsDataEntry3_f20.jpg" alt="FIGURE: A completed weights information table" />

 </div>

 </div>

 </div>

 <div class="sect3">

-<h4 id="_editing_several_selected_dives_simultaneously">4.2.6. Editing several selected dives simultaneously</h4>

+<h4 id="_editing_several_selected_dives_simultaneously">5.2.6. 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

 as a few items of information

@@ -1372,23 +1447,24 @@ 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>.

+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.

 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>

+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">4.2.7. Adding Bookmarks to a dive</h4>

+<h4 id="_adding_bookmarks_to_a_dive">5.2.7. 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 bouy". This is easily

+during the dive, e.g. "Saw dolphins", or "Released surface buoy". This is easily

 done:</p></div>

 <div class="ulist"><ul>

 <li>

 <p>

 Right-click at the appropriate point on the dive profile.

-This brings up the dive profile context menu. Select <em>Add bookmark</em>. A red flag is

-placed on the dive profile at the point that was initially selected (see <strong>A</strong> below).

+   This brings up the dive profile context menu. Select <em>Add bookmark</em>. A red flag is

+   placed on the dive profile at the point that was initially selected (see <strong>A</strong> below).

 </p>

 </li>

 <li>

@@ -1399,13 +1475,13 @@ Right-click on the red flag. This brings up the context menu (see <strong>B</str
 <li>

 <p>

 A text box is shown. Type the explanatory text for the bookmark (see <strong>C</strong> below). Select <em>OK</em>.

-This saves the text associated with the bookmark.

+   This saves the text associated with the bookmark.

 </p>

 </li>

 <li>

 <p>

 If one hovers using the mouse over the red bookmark, the appropriate text is shown at

-the bottom of the information box (see <strong>D</strong> below).

+   the bottom of the information box (see <strong>D</strong> below).

 </p>

 </li>

 </ul></div>

@@ -1416,7 +1492,7 @@ the bottom of the information box (see <strong>D</strong> below).
 </div>

 </div>

 <div class="sect3">

-<h4 id="_saving_the_updated_dive_information">4.2.8. Saving the updated dive information</h4>

+<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

@@ -1430,7 +1506,7 @@ that the new data should be saved.</p></div>
 </div>

 </div>

 <div class="sect2">

-<h3 id="_importing_dive_information_from_other_digital_data_sources_or_other_data_formats">4.3. Importing dive information from other digital data sources or other data formats</h3>

+<h3 id="_importing_dive_information_from_other_digital_data_sources_or_other_data_formats">5.3. Importing dive information from other digital data sources or other data formats</h3>

 <div class="paragraph" id="S_ImportingAlienDiveLogs"><p>If a user has been diving for some time, it is possible that several dives were

 logged using other dive log software. This information does not need retyping

 because these dive logs can probably be

@@ -1454,7 +1530,7 @@ them from there with
 <em>Subsurface</em>, as divelogs.de supports a few additional logbook formats that

 <em>Subsurface</em> currently cannot parse.</p></div>

 <div class="paragraph"><p>If the format of other software is supported natively on Subsurface, it should be sufficient to select

-either <em>Import&#8594;Import log files</em> or <em>File&#8594;Open log file</em>. <em>Subsurface</em> supports the data formats

+either <em>Import &#8594;  Import log files</em> or <em>File &#8594;  Open log file</em>. <em>Subsurface</em> supports the data formats

 of many dive computers, including Suunto and Shearwater. When importing dives, <em>Subsurface</em>

 tries to detect multiple records for

 the same dive and merges the information as best as it can. If

@@ -1462,13 +1538,13 @@ 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>

 <div class="sect3">

-<h4 id="_using_the_universal_import_dialogue">4.3.1. Using the universal import dialogue</h4>

+<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>

 <div class="imageblock" style="text-align:center;">

 <div class="content">

-<img src="images/Import1.jpg" alt="FIGURE: Import dialogue: step 1" />

+<img src="images/Import1_f20.jpg" alt="FIGURE: Import dialogue: step 1" />

 </div>

 </div>

 <div class="paragraph"><p>Towards the bottom right is a dropdown selector with a default label

@@ -1477,7 +1553,7 @@ available, as in dialogue <strong>B</strong>, above. Currently these are:</p></d
 <div class="ulist"><ul>

 <li>

 <p>

-XML-formatted dive logs (Divinglog 5.0, MacDive and several other dive log systems)

+XML-formatted dive logs (DivingLog 5.0, MacDive and several other dive log systems)

 </p>

 </li>

 <li>

@@ -1492,7 +1568,7 @@ UDCF-formatted dive logs
 </li>

 <li>

 <p>

-Poseidon CCR logs

+Poseidon MkVI CCR logs

 </p>

 </li>

 <li>

@@ -1516,63 +1592,7 @@ the imported dive log in the <em>Subsurface</em> <strong>Dive List</strong>. Som
 accessible through the Import dialogue are also supported, as explained below.</p></div>

 </div>

 <div class="sect3">

-<h4 id="_importing_dive_logs_from_closed_circuit_rebreather_ccr_systems">4.3.2. Importing dive logs from closed circuit rebreather (CCR) systems</h4>

-<div class="admonitionblock">

-<table><tr>

-<td class="icon">

-<img src="images/APD.jpg" alt="Note" />

-</td>

-<td class="content">Closed system rebreathers use avanced technology to recirculate

-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 open circuit

-dive computer, a CCR system computer does not allow the download of a log

-containg 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 databases.</td>

-</tr></table>

-</div>

-<div class="sect4">

-<h5 id="_import_a_ccr_dive">Import a CCR dive</h5>

-<div class="paragraph"><p>See the section dealing with <a href="#S_ImportingAlienDiveLogs">Importing dive information from other

-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 the previous section, the bottom right

-hand of the import dialogue contains a dropdown list of appropriate devices

-that currently includes an option for MkVI files. 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>

-</div>

-<div class="sect4">

-<h5 id="_displayed_information_for_a_dive">Displayed information for a  dive</h5>

-<div class="paragraph"><p><em>Partial pressures of gases</em>: The graph of oxygen partial pressure shows the

-information from the oxygen sensors of the CCR equipment. In the case of the

-Poseidon MKVI, the mean value of the two oxygen sensors are shown. In the case

-of the APD equipment, the mean of the three oxygen sensors are shown. If one

-sensor shows a very different oxygen PO2 reading compared to the others, the

-divergent sensor is ingnored. For CCR dives the graph for oxygen partial pressure

-should be fairly flat, reflecting the setpoint settings during the dive.

-Partial pressures for nitrogen (and helium,

-if applicable) are shown in the usual way as for other dives.</p></div>

-<div class="paragraph"><p><em>Cylinder pressures</em>: CCR dive computers like the Poseidon MkVI record the

-pressures of the oxygen and diluent cylinders. The pressure of the oxygen cylinder

-is shown on the dive profile. In addition, start and end pressures for both oxygen

-and diluent cylinders are shown in the <em>Equipment Tab</em>.</p></div>

-<div class="paragraph"><p><em>Equipment-specific information</em>: Equipment-specific information gathered by

-<em>Subsurface</em> is shown in the <em>Extra data</em> tab. This may include setup information

-or metadata about the dive.</p></div>

-<div class="paragraph"><p>More equipment-specific information for downloading CCR dive logs can be found in <a href="#S_PoseidonMkVI">Appendix B</a>.</p></div>

-</div>

-</div>

-<div class="sect3">

-<h4 id="_importing_from_mares_dive_organiser_v2_1">4.3.3. Importing from Mares Dive Organiser V2.1</h4>

+<h4 id="_importing_from_mares_dive_organiser_v2_1">5.3.2. 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

@@ -1582,33 +1602,33 @@ using <em>www.divelogs.de</em> as a mechanism to extract the dive log informatio
 <li>

 <p>

 The dive log data from Mares Dive Organiser need to be exported 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.

+   desktop, using

+   a <em>.sdf</em> file name extension. Refer to <a href="#Mares_Export">Appendix C</a> for more

+   information.

 </p>

 </li>

 <li>

 <p>

 Data should then be imported into <em>www.divelogs.de</em>. One needs to create a user

-account in

-<em>www.divelogs.de</em>, log into that web site, then

-select <em>Import Logbook &#8594; Dive Organiser</em> from the menu on the left hand side.

-The instructions must be carefully followed to transfer the dive information

-(in <em>.sdf</em> format) from the Dive Organiser database to <em>www.divelogs.de</em>.

+   account in

+   <em>www.divelogs.de</em>, log into that web site, then

+   select <em>Import Logbook &#8594;  Dive Organiser</em> from the menu on the left hand side.

+   The instructions must be carefully followed to transfer the dive information

+   (in <em>.sdf</em> format) from the Dive Organiser database to <em>www.divelogs.de</em>.

 </p>

 </li>

 <li>

 <p>

 Finally,  import the dives

-from <em>divelogs.de</em> to <em>Subsurface</em>, using the instructions below.

+   from <em>divelogs.de</em> to <em>Subsurface</em>, using the instructions below.

 </p>

 </li>

 </ol></div>

 </div>

 <div class="sect3">

-<h4 id="S_ImportingDivelogsDe">4.3.4. Importing dives from <strong>divelogs.de</strong></h4>

+<h4 id="S_ImportingDivelogsDe">5.3.3. 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 form Divelogs.de</em> option should be selected

+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

 user-ID and password for <em>divelogs.de</em> into the appropriate fields and then

@@ -1625,167 +1645,208 @@ success status is indicated (see figure on the right [<strong>B</strong>], below
 </div>

 </div>

 <div class="sect3">

-<h4 id="S_ImportingCSV">4.3.5. Importing dives in CSV format</h4>

-<div class="paragraph"><p>Sometimes dive computers export dive information as files with

-<em>comma-separated values</em> (.CSV). For example, the APD Inspiration and Evolution

-closed circuit rebreather (CCR) systems export dive information in a CSV

-formatted file that normally contains information for a single dive only. These

-files can easily be imported into <em>Subsurface</em>.

-CSV files are normally organised into

-a single line that provides the headers of the data columns, followed by the

-data, one record per line. CSV files can be opened with a normal text editor.

-Following is a highly simplified and shortened example of a CSV file from an

-APD rebreather:</p></div>

-<div class="literalblock">

-<div class="content">

-<pre><code>        Dive Time (s)   Depth (m)       pO₂ - Setpoint (Bar)  pO₂ - C1 Cell

-1 (Bar) Ambient temp. (Celsius)

-        0       0.0     0.70    0.81    13.1

-        0       1.2     0.70    0.71    13.1

-        0       0.0     0.70    0.71    13.1

-        0       1.2     0.70    0.71    13.2

-        0       1.2     0.70    0.71    13.1

-        10      1.6     0.70    0.72    12.7

-        20      1.6     0.70    0.71    12.6

-        30      1.7     0.70    0.71    12.6

-        40      1.8     0.70    0.68    12.5

-        50      1.6     0.70    0.68    12.5

-        60      2.4     0.70    0.69    12.5

-        70      3.5     0.70    0.69    12.4

-        80      4.2     0.70    0.72    12.5

-        90      4.0     0.70    0.71    12.4</code></pre>

-</div></div>

-<div class="paragraph"><p>Note that each title may comprise more than one word; for instance

-<em>Dive Time (s)</em> in the above data example. Before being able to import the data

-to <em>Subsurface</em> one first needs to know:</p></div>

-<div class="olist loweralpha"><ol class="loweralpha">

+<h4 id="S_ImportingCSVData">5.3.4. 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

+simplified format that allows for easy information exchange between different computers or

+software packages. For an introduction to CSV-formatted files see <a href="#S_CSV_Intro">A Diver&#8217;s

+Introduction To CSV Files</a>. <em>Subsurface</em> dive logs can also be exported in <em>CSV</em> format to

+other software that reads this format. See <a href="#S_Appendix_D">APPENDIX D: Exporting a spreadsheet

+to CSV format</a> for information that may be helpful for importing spreadsheet-based data

+into <em>Subsurface</em>.</p></div>

+<div class="sect4">

+<h5 id="S_ImportingCSVDives">Importing dives in CSV format from dive computers or other dive log software</h5>

+<div class="paragraph"><p>One can view a <em>CSV</em> file by using an ordinary text editor. It is normally organised into

+a single line that provides the headers (or <em>field names</em> or <em>column headings</em>) of the data

+columns, followed by the data, one record per line.</p></div>

+<div class="paragraph"><p>There are two types of <em>CSV</em> dive logs that can be imported into <em>Subsurface</em>:</p></div>

+<div class="olist arabic"><ol class="arabic">

 <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.

-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

-the numbers are aligned in columns,

-the file is probably TAB-delimited (i.e. it uses a TAB as a field separator, as

-in the above example).

+<em>CSV dive details</em>: This dive log format contains similar information to that of a

+   typical written dive log, e.g. dive date and time, dive depth, dive duration, names of

+   buddy and dive master and perhaps some information about cylinder pressures before and

+   after the dive, as well as a comment or two about the dive. All the data for a single

+   dive go on a single line of text, following the order of the column headings.

 </p>

 </li>

 <li>

 <p>

-Which data columns need to be imported into <em>Subsurface</em>? The Dive Time and

-Depth columns are always required. Open the file using a text editor and note

-the titles of the columns to be imported and their column positions. For

-instance for the above example:

+<em>CSV dive profile</em>: This dive log format includes much more information about a single

+   dive. For instance there may be information at 30-second intervals, indicating depth, water

+   temperature at that depth, and cylinder pressure at that moment in time. Each line contains

+   the information for a single instant in time during the dive, 30 seconds after that

+   of the previous instant. Many lines

+   are required to complete the depth profile information for a single dive. This is a common

+   export format used by closed-circuit rebreather (CCR) dive equipment and many software

+   packages that handle dive computer data and/or dive logs.

 </p>

-<div class="literalblock">

-<div class="content">

-<pre><code>Time:           column 1

-Depth:          column 2

-Temperature:    column 5

-pO₂:          column 4</code></pre>

-</div></div>

 </li>

 </ol></div>

-<div class="paragraph"><p>Armed with this information, importing the data into <em>Subsurface</em> is

-straightforward. Select

-<em>Import&#8594;Import Log Files</em> from the main menu. In the resulting file

-selection menu, select <em>CSV files</em>, after which a common configuration dialog

-appears for all the

-files with a CSV extension:</p></div>

-<div class="imageblock" style="text-align:center;">

-<div class="content">

-<img src="images/Import_CSV1.jpg" alt="FIGURE: CSV download dialogue" />

-</div>

-</div>

-<div class="paragraph"><p>There are pre-configured definitions for some dive computers, e.g. the APD

-rebreathers. If the user&#8217;s dive computer is on this list, it should be selected

-using the dropdown

-box labeled <em>Pre-configured imports</em>. Select the button at the bottom right

-to indicate whether the dive data are in metric of imperial units.

-Finally <em>OK</em> should be clicked and

-the dive will be imported and listed in the <strong>Dive List</strong> tab of <em>Subsurface</em>.</p></div>

-<div class="paragraph"><p>If the dive computer is not on the pre-configured list, the user must

-select the <em>Field

-Separator</em> (TAB or comma) for the particular CSV file, using the appropriate

-dropdown list. and indicate which columns in the CSV file

-contain which data

-variables. For each data column used for import, the user must check the

-appropriate check box

-and indicate in which column these data are found. For instance, the image above

-corresponds to the dialogue that would apply to the CSV data set described above

-the image. After completing the column specification, select the <em>OK</em> button

-and the dive will be imported and listed in the <strong>Dive List</strong> tab of <em>Subsurface</em>.</p></div>

-</div>

-<div class="sect3">

-<h4 id="S_ImportingManualCSV">4.3.6. Importing dives from manually kept CSV file</h4>

-<div class="paragraph"><p>If one keeps dive logs in a spreadsheet, there is an option to import

-those dives as well. Spreadsheet data, exported as a CSV file, can

-be imported to <em>Subsurface</em>. When importing manually

-kept log files, the information needed is quite different as we are

-importing only metadata, not profile samples.</p></div>

-<div class="paragraph"><p>Similarly to importing dives in CSV format (see above), one needs to

-know the internal format

-of the CSV data to import.</p></div>

+<div class="paragraph"><p>Before being able to import the <em>CSV</em> data to <em>Subsurface</em> <strong>one needs to know a few

+things about the data being imported</strong>:</p></div>

 <div class="olist loweralpha"><ol class="loweralpha">

 <li>

 <p>

 Which character separates the different columns within a single line of

-data? This

-should be either a comma (,), semicolon (;) or a TAB

-character, and could 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

-the data

-are in clear columns, the file

-is probably TAB-delimited (i.e. it uses a TAB as a field separator, as in the

-above example).

-A recommended field separator for the export is tab, as commas might be part of

-the

-field values themselves. Therefore the use of an appropriate field separator

-in very important.

+   data? This field separator should be either a comma (,) 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

+   the numbers are aligned in columns,

+   the file is probably TAB-delimited (i.e. it uses a TAB as a field separator).

 </p>

 </li>

 <li>

 <p>

-Which columns need to be imported into <em>Subsurface</em>? We do not

-currently have any mandatory input fields, but some, e.g. dive duration

-are crucial for the log file to make any sense. Possible options

-can be seen in the image below and one should include all the

-fields available in both your log file and in the <em>Subsurface</em>

-import.

+Which data columns need to be imported into <em>Subsurface</em>? Is it a <em>CSV dive details</em>

+   file or a <em>CSV dive profile</em> file? Open the file using a text editor and note

+   the titles of the columns to be imported and their column positions.

 </p>

 </li>

 <li>

 <p>

-Units used for depth, weight and temperature. We consider depth to be

-either feet or meters, weight kilograms or pounds and temperature either

-Celsius or Fahrenheit. However, the users can select <em>Metric</em> or

-<em>Imperial</em> in the <em>Preferences</em> tab of <em>Subsurface</em>. No mixture of unit

-systems is allowed for the different fields.

+Is the numeric information (e.g. dive depth) in metric or in imperial unis?

 </p>

 </li>

 </ol></div>

-<div class="paragraph"><p>Importing manually kept CSV log files is quite straight forward, but

-there might be many fields and counting the field numbers is error

-prone. Therefore validation of the data to be imported is critical.</p></div>

-<div class="paragraph"><p>To import the dives, select <em>Import&#8594;Import Log Files</em> from the menu

-bar. If the CSV option in the dropdown list is selected and the file list

-includes file names ending with .CSV, one can select the

-<em>Manual dives</em> tab that will bring up the following configuration dialog:</p></div>

+<div class="paragraph"><p>Armed with this information, importing the data into <em>Subsurface</em> is

+straightforward. Select

+<em>Import &#8594;  Import Log Files</em> from the main menu. In the resulting file

+selection menu, select <em>CSV files</em> (towards the bottom right). This shows all .CSV files in the selected

+directory. Select the file that needs to be imported. A configuration panel

+appears as depicted below:</p></div>

+<div class="imageblock" style="text-align:center;">

+<div class="content">

+<img src="images/csv_import1_f20.jpg" alt="FIGURE: CSV download dialogue 1" />

+</div>

+</div>

+<div class="paragraph"><p>Notice that, at the top left, there is a dropdown list containing pre-configured

+settings for some of the more common dive computers and software packages

+encountered by divers. If the <em>CSV</em> file being imported originated from any of

+these pre-configured items, then select it. Otherwise use the <em>Manual Import</em>

+option. The configuration panel also has dropdown lists for the specification of the appropriate

+field separator (Tab, comma or semicolon), the date format used in the <em>CSV</em> file,

+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-frop 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

+cell at the top of the table. To indicate the correct column for "Dive #", drag

+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;">

 <div class="content">

-<img src="images/Import_CSV2.jpg" alt="FIGURE: Download dialog for Manual CSV logs" />

+<img src="images/csv_import2_f20.jpg" alt="FIGURE: CSV download dialogue 2" />

+</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.

+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">

+<div class="paragraph"><p><strong>A Diver&#8217;s Introduction to <em>CSV</em> Files</strong></p></div>

+<div class="admonitionblock">

+<table><tr>

+<td class="icon">

+<img src="images/icons/important.png" alt="Important" />

+</td>

+<td class="content"><em>CSV</em> is an abbreviation for a data file format: <em>Comma-Separated Variables</em>. It is a

+file format allowing someone to view or edit the information using a text editor such

+as Notebook (Windows), gedit (Linux) or TextWrangler (OS/X). The two main advantages of

+the <em>CSV</em> format is that the data are easily editable as text without any proprietary software

+and ensuring all information is human-readable, not being obscured by any custom or

+proprietary attributes that proprietary software insert into files.

+Because of its simplicity the <em>CSV</em> format is used

+as an interchange format between many software packages, e.g. between

+spreadsheet, statistical, graphics, database and diving software. Within <em>Subsurface</em>, <em>CSV</em> files can also

+be used to import information from other sources such as spreadsheet-based dive logs and

+even from some dive computers.</td>

+</tr></table>

+</div>

+<div class="paragraph"><p><em>CSV</em> files can be created or edited with a normal text editor. The most important attribute of a

+<em>CSV</em> file is the <em>field separator</em>, the character used to separate fields within a single line. The

+field separator is frequently a comma, a colon, a SPACE character or a TAB character. When exporting data from

+spreadsheet software, the field separator needs to be specified in order to create the <em>CSV</em> file. <em>CSV</em> files are

+normally organised into a single line that provides the headers (or <em>field names</em>) of the data columns,

+followed by the data, one record per line. Note that each field name

+may comprise more than one word separated by spaces; for instance <em>Dive site</em>, below. Here is an example of

+dive information for four dives using a comma as a field separator:</p></div>

+<div class="literalblock">

+<div class="content">

+<pre><code>Dive site,Dive date,Time,Dive_duration, Dive_depth,Dive buddy

+Illovo Beach,2012-11-23,10:45,46:15,18.4,John Smith

+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="literalblock">

+<div class="content">

+<pre><code>Dive site       Dive date       Time    Dive_duration   Dive_depth      Dive buddy

+Illovo Beach    2012-11-23      10:45   46:15   18.4    John Smith

+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>It is clear why many people prefer the TAB-delimited format to the comma-delimited format. The

+disadvantage is that one cannot see

+the TAB characters. For instance, the space between <em>Dive</em> and <em>date</em> in the top line may be

+a SPACE character or a TAB character (in this case it is a SPACE character: the tabs are before and

+after <em>Dive date</em>). If the field names in the first line are long, the alignment with data in the other lines

+cannot be maintained. Here is a highly simplified and shortened TAB-delimited example of a <em>CSV</em> dive log

+from an APD closed-circuit rebreather (CCR) dive computer:</p></div>

+<div class="literalblock">

+<div class="content">

+<pre><code>Dive Time (s)   Depth (m)       pO₂ - Setpoint (Bar)  pO₂ - C1 Cell 1 (Bar) Ambient temp. (Celsius)

+0       0.0     0.70    0.81    13.1

+0       1.2     0.70    0.71    13.1

+0       0.0     0.70    0.71    13.1

+0       1.2     0.70    0.71    13.2

+0       1.2     0.70    0.71    13.1

+10      1.6     0.70    0.72    12.7

+20      1.6     0.70    0.71    12.6

+30      1.7     0.70    0.71    12.6

+40      1.8     0.70    0.68    12.5</code></pre>

+</div></div>

+<div class="paragraph"><p>When a <em>CSV</em> file is selected for import, <em>Subsurface</em> displays the column headers as well as some of the data

+in the first few lines of the <em>CSV</em> file, making it much easier to work with <em>CSV</em> files.

+<em>CSV</em> files can therefore be used in many contexts for importing data into a <em>Subsurface</em> dive log.

+Knowledge of a few basic things about the content of the <em>CSV</em> file allows a smooth import

+of the dives into <em>Subsurface</em>.</p></div>

+</div></div>

+<div class="admonitionblock">

+<table><tr>

+<td class="icon">

+<img src="images/icons/important.png" alt="Important" />

+</td>

+<td class="content">The <em>CSV</em> import has a couple of caveats. One should avoid some special characters

+like ampersand (&amp;), less than (&lt;), greater than (&gt;) and double quotes (") as part

+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

+a smaller file to make sure everything works.</td>

+</tr></table>

 </div>

 </div>

-<div class="paragraph"><p>The input fields can be configured as appropriate, and when everything is done

-the <em>OK</em> button should be selected to perform the import. New dives should

-appear in the <strong>Dive List</strong> area of <em>Subsurface</em>.</p></div>

 </div>

 </div>

 <div class="sect2">

-<h3 id="S_Companion">4.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 Android device with a GPS, the coordinates

+<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

 for the diving

 location can be automatically passed to the <em>Subsurface</em>

 dive log. The Companion App stores the dive locations on

@@ -1793,49 +1854,49 @@ a dedicated Internet-based file server. <em>Subsurface</em>, in turn, can collec
 the localities from the file server.</p></div>

 <div class="paragraph"><p>To do this:</p></div>

 <div class="sect3">

-<h4 id="_create_a_companion_app_account">4.4.1. Create a Companion App account</h4>

+<h4 id="_create_a_companion_app_account">5.4.1. Create a Companion App account</h4>

 <div class="ulist"><ul>

 <li>

 <p>

 Register on the <a href="http://api.hohndel.org/login/"><em>Subsurface companion web page</em></a>.

-A confirmation email with instructions and a personal <strong>DIVERID</strong> will be sent,

-a long number that gives access to the file server and Companion App capabilities.

+  A confirmation email with instructions and a personal <strong>DIVERID</strong> will be sent,

+  a long number that gives access to the file server and Companion App capabilities.

 </p>

 </li>

 <li>

 <p>

 Download the app from

-<a href="https://play.google.com/store/apps/details?id=org.subsurface">Google Play Store</a>

-or from

-<a href="http://f-droid.org/repository/browse/?fdfilter=subsurface&amp;fdid=org.subsurface">F-Droid</a>.

+  <a href="https://play.google.com/store/apps/details?id=org.subsurface">Google Play Store</a>

+  or from

+  <a href="http://f-droid.org/repository/browse/?fdfilter=subsurface&amp;fdid=org.subsurface">F-Droid</a>.

 </p>

 </li>

 </ul></div>

 </div>

 <div class="sect3">

-<h4 id="_using_the_subsurface_companion_app_on_a_smartphone">4.4.2. Using the Subsurface companion app on a smartphone</h4>

+<h4 id="_using_the_subsurface_companion_app_on_an_android_smartphone">5.4.2. Using the Subsurface companion app on an Android smartphone</h4>

 <div class="paragraph"><p>On first use the app has three options:</p></div>

 <div class="ulist"><ul>

 <li>

 <p>

 <em>Create a new account.</em>  Equivalent to registering in <em>Subsurface</em> companion

-page using an Internet browser. One can request a <strong>DIVERID</strong> using this option,

-but this is supplied via email and followed up by interaction with the

-<a href="http://api.hohndel.org/login/"><em>Subsurface companion web page</em></a> in order to

-activate the account.

+  page using an Internet browser. One can request a <strong>DIVERID</strong> using this option,

+  but this is supplied via email and followed up by interaction with the

+  <a href="http://api.hohndel.org/login/"><em>Subsurface companion web page</em></a> in order to

+  activate the account.

 </p>

 </li>

 <li>

 <p>

 <em>Retrieve an account.</em>  If users forgot their <strong>DIVERID</strong> they will receive an email

-to recover the number.

+  to recover the number.

 </p>

 </li>

 <li>

 <p>

 <em>Use an existing account.</em> Users are prompted for their <strong>DIVERID</strong>. The app saves

-this <strong>DIVERID</strong> and does not ask for it again unless one uses the <em>Disconnect</em> menu

-option (see below).

+  this <strong>DIVERID</strong> and does not ask for it again unless one uses the <em>Disconnect</em> menu

+  option (see below).

 </p>

 </li>

 </ul></div>

@@ -1846,7 +1907,7 @@ option (see below).
 </td>

 <td class="content">In the <em>Subsurface</em> main program, the <strong>DIVERID</strong> should also be entered on the

 Default Preferences

-panel, obtained by selecting <em>File&#8594;Preferences&#8594;Defaults</em> from the main menu

+panel, obtained by selecting <em>File &#8594;  Preferences &#8594;  Defaults</em> from the main menu

 in <em>Subsurface</em> itself.

 This facilitates synchronisation between <em>Subsurface</em> and the Companion App.</td>

 </tr></table>

@@ -1862,19 +1923,19 @@ showed with 3 options:</p></div>
 <li>

 <p>

 Current: A prompt for a place name (or a request to activate the GPS if it is turned

-off) will be displayed, after which the current location is saved.

+  off) will be displayed, after which the current location is saved.

 </p>

 </li>

 <li>

 <p>

 Use Map: This option allows the user to fix a position by searching a world map. A

-world map is shown (see <strong>B</strong> below) on which one should indicate the desired position

-with a <em>long press</em> on the touch

-sensitive screen (if the marked location is erroneous, simply indicate a new location)

-and select the check symbol in the upper right. A dialog is shown allowing to enter the

-name of the dive location and the date-time of the dive (see <strong>C</strong> below). In order to import this

-dive location in <em>Subsurface</em> it&#8217;s advisable to set the time to agree with the time of

-that dive on the dive computer.

+  world map is shown (see <strong>B</strong> below) on which one should indicate the desired position

+  with a <em>long press</em> on the touch

+  sensitive screen (if the marked location is erroneous, simply indicate a new location)

+  and select the check symbol in the upper right. A dialog is shown allowing to enter the

+  name of the dive location and the date-time of the dive (see <strong>C</strong> below). In order to import this

+  dive location in <em>Subsurface</em> it&#8217;s advisable to set the time to agree with the time of

+  that dive on the dive computer.

 </p>

 </li>

 </ul></div>

@@ -1887,10 +1948,10 @@ that dive on the dive computer.
 <li>

 <p>

 Import local GPX file: The android device searches for .gpx files and located

-archives will be shown. The selected .gpx file is opened and the stored

-locations shown. Now one needs to select the appropriate locations, then select the

-tab in the upper right, after which the locations will be sent to the web service

-and added to the list on the Android device.

+  archives will be shown. The selected .gpx file is opened and the stored

+  locations shown. Now one needs to select the appropriate locations, then select the

+  tab in the upper right, after which the locations will be sent to the web service

+  and added to the list on the Android device.

 </p>

 </li>

 </ul></div>

@@ -1971,8 +2032,8 @@ downloaded to a <em>Subsurface</em> dive log (see below).</p></div>
 <li>

 <p>

 <em>User ID.</em> The DIVERID obtained by registering as described above. The easiest way to

-obtain it is simply to copy and paste from the confirmation email but, of

-course, users can also type this information.

+  obtain it is simply to copy and paste from the confirmation email but, of

+  course, users can also type this information.

 </p>

 </li>

 </ul></div>

@@ -1983,13 +2044,13 @@ course, users can also type this information.
 <li>

 <p>

 <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.

+  on the web service synchronise each time the app is started.

 </p>

 </li>

 <li>

 <p>

 <em>Upload new dives.</em> If selected, each time the user adds a dive location it is

-automatically sent to the server.

+  automatically sent to the server.

 </p>

 </li>

 </ul></div>

@@ -2003,7 +2064,7 @@ in the background of their Android device, allowing the continuous collection of
 <li>

 <p>

 <em>Min duration.</em> In minutes. The app will try to get a location every X minutes

-until stopped by the user.

+  until stopped by the user.

 </p>

 </li>

 <li>

@@ -2077,7 +2138,28 @@ of another registered diver.</p></div>
 </div>

 </div>

 <div class="sect3">

-<h4 id="_downloading_dive_locations_to_the_em_subsurface_em_divelog">4.4.3. Downloading dive locations to the <em>Subsurface</em> divelog</h4>

+<h4 id="S_iphone">5.4.3. Using the Subsurface companion app on an <em>iPhone</em> to record dive locations</h4>

+<div class="paragraph"><p>The iPhone interface is quite simple. One needs to type the user ID (obtained

+during registration) into the space reserved for it, then select "Dive in"

+(see left part of the image below) and start collecting dive location information.</p></div>

+<div class="imageblock" style="text-align:center;">

+<div class="content">

+<img src="images/iphone.jpg" alt="FIGURE: Using iPhone companion application" width="640" />

+</div>

+</div>

+<div class="paragraph"><p>Dives can be added automatically or manually. In manual mode, a dive location or waypoint is added to the GPS input stream. In automatic mode, a continuous path of GPS locations is created from which, much later, after import, subsurface can select the appropriate GPS locations based on the times of dives. The default mode for the <em>iphone</em> is automatic. When one adds a dive, the

+location service is started automatically and a red bar appears at the bottom

+of the screen. After the dive one can click on the red

+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

+to the webservice and there is not an option to

+trigger upload manually.</p></div>

+</div>

+<div class="sect3">

+<h4 id="_downloading_dive_locations_to_the_em_subsurface_em_divelog">5.4.4. Downloading dive locations to the <em>Subsurface</em> divelog</h4>

 <div class="paragraph"><p>Download dive(s) from a dive computer or enter them manually into

 <em>Subsurface</em> before obtaining the GPS coordinates from the server. The download

 dialog can be reached via <em>Ctrl+G</em> or from the <em>Subsurface</em> Main Menu <em>Import

@@ -2121,43 +2203,43 @@ downloading GPS data.</p></div>
 <li>

 <p>

 <em>Background service</em>, being a very powerful tool, may fill the location list with

-many unnecessary locations not corresponding to the exact dive point but reflecting the boat&#8217;s route.

-Currently these locations are difficult to delete from the server. In some situations it

-is therefore prudent to clean up the list on the Android device before sending the dive points to the web

-server by simply deleting the inappropriate locations. This might be necessary, for

-instance, if one wants to keep the location list clear to see dives in the web service map display (see above).

+  many unnecessary locations not corresponding to the exact dive point but reflecting the boat&#8217;s route.

+  Currently these locations are difficult to delete from the server. In some situations it

+  is therefore prudent to clean up the list on the Android device before sending the dive points to the web

+  server by simply deleting the inappropriate locations. This might be necessary, for

+  instance, if one wants to keep the location list clear to see dives in the web service map display (see above).

 </p>

 </li>

 <li>

 <p>

 It may also make sense to give informative names to the locations sent to the web server, or at least

-to use an informative name in the <em>Name Template</em> setting while running the <em>background service</em>,

-especially on a dive trip with many dives and dive locations.

+  to use an informative name in the <em>Name Template</em> setting while running the <em>background service</em>,

+  especially on a dive trip with many dives and dive locations.

 </p>

 </li>

 </ul></div>

 </div>

 </div>

 <div class="sect2">

-<h3 id="S_LoadImage">4.5. Adding photographs to dives</h3>

+<h3 id="S_LoadImage">5.5. Adding photographs to dives</h3>

 <div class="paragraph"><p>Many (if not most) divers take a camera with them and take photographs

 during a dive. One would like to associate each photograph with a specific

 dive. <em>Subsurface</em> allows one to load photos into a dive. Photos are superimposed

 on the dive profile, from where they can be viewed.</p></div>

 <div class="sect3">

-<h4 id="_loading_photos_and_getting_synchronisation_between_dive_computer_and_camera">4.5.1. Loading photos and getting synchronisation between dive computer and camera</h4>

+<h4 id="_loading_photos_and_getting_synchronisation_between_dive_computer_and_camera">5.5.1. Loading photos and getting synchronisation between dive computer and camera</h4>

 <div class="paragraph"><p>Left-lick on a dive or on a group of dives on the dive list. Then right-click on this

 dive or group of dives and choose the option <em>Load Images</em>:</p></div>

 <div class="imageblock" style="text-align:center;">

 <div class="content">

-<img src="images/LoadImage1.jpg" alt="FIGURE: Load images option" />

+<img src="images/LoadImage1_f20.jpg" alt="FIGURE: Load images option" />

 </div>

 </div>

 <div class="paragraph"><p>The system file browser appears. Select the folder and photographs that need

 to be loaded into <em>Subsurface</em> and click the <em>Open</em> button.</p></div>

 <div class="imageblock" style="text-align:center;">

 <div class="content">

-<img src="images/LoadImage2.jpg" alt="FIGURE: Load images option" />

+<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

@@ -2172,42 +2254,42 @@ the dive profile.</p></div>
 <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

-both devices after the dive or even at the end of the day. One can then manually set the time

-difference in the <em>Time shift</em> dialog. Towards the top of the dialog is a time setting tool

-immediately under the heading <em>Shift times of image(s) by</em>, evident in figure <strong>A</strong> below.

-If the camera time is 7 minutes later than that of the dive computer, set the time setting

-tool to a value of 00:07.  Select either the <em>earlier</em> or <em>later</em> radio button.

-In the above example, the <em>earlier</em> option is appropriate, since the photos need to be shifted

-7 minutes earlier (camera is 7 minutes ahead of dive computer). Ignore any "AM" or "PM" suffix

-in that tool. Click the <em>OK</em> button and synchronisation is achieved.

+  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

+  both devices after the dive or even at the end of the day. One can then manually set the time

+  difference in the <em>Time shift</em> dialog. Towards the top of the dialog is a time setting tool

+  immediately under the heading <em>Shift times of image(s) by</em>, evident in figure <strong>A</strong> below.

+  If the camera time is 7 minutes later than that of the dive computer, set the time setting

+  tool to a value of 00:07.  Select either the <em>earlier</em> or <em>later</em> radio button.

+  In the above example, the <em>earlier</em> option is appropriate, since the photos need to be shifted

+  7 minutes earlier (camera is 7 minutes ahead of dive computer). Ignore any "AM" or "PM" suffix

+  in that tool. Click the <em>OK</em> button and synchronisation is achieved.

 </p>

 </li>

 </ul></div>

 <div class="imageblock" style="text-align:center;">

 <div class="content">

-<img src="images/LoadImage3b.jpg" alt="FIGURE: Synchronisation dialog" />

+<img src="images/LoadImage3b_f20.jpg" alt="FIGURE: Synchronisation dialog" />

 </div>

 </div>

 <div class="ulist"><ul>

 <li>

 <p>

 <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

-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

-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.

+  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

+  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

+  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.

 </p>

 </li>

 </ul></div>

@@ -2215,12 +2297,12 @@ date-time on image <strong>B</strong> above.
 the dive profile. If the timestamp of the photo is within 30 minutes of the dive, it is shown.</p></div>

 </div>

 <div class="sect3">

-<h4 id="_viewing_the_photos">4.5.2. Viewing the photos</h4>

+<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.png" alt="FIGURE:Show photos toolbar button" />

+<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>

@@ -2239,14 +2321,14 @@ as tiny icons (stubs) on the dive profile at the appropriate positions reflectin
 </ul></div>

 <div class="imageblock" style="text-align:center;">

 <div class="content">

-<img src="images/LoadImage4.jpg" alt="FIGURE: Photos on dive profile" />

+<img src="images/LoadImage4_f20.jpg" alt="FIGURE: Photos on dive profile" />

 </div>

 </div>

 <div class="paragraph"><p>If one hovers with the mouse over any of the photo icons, then a thumbnail photo

 is shown of the appropriate photo. See the image below:</p></div>

 <div class="imageblock" style="text-align:center;">

 <div class="content">

-<img src="images/LoadImage5.jpg" alt="FIGURE:Thumbnail photo on dive profile" />

+<img src="images/LoadImage5_f20.jpg" alt="FIGURE:Thumbnail photo on dive profile" />

 </div>

 </div>

 <div class="paragraph"><p>Clicking on the thumbnail brings up a full size

@@ -2258,12 +2340,12 @@ is required when clicking on a thumbnail. Images
 can also be deleted using the <em>Photos</em> tab (see text below).</p></div>

 <div class="imageblock" style="text-align:center;">

 <div class="content">

-<img src="images/LoadImage6.jpg" alt="FIGURE: Full-screen photo on dive profile" />

+<img src="images/LoadImage6_f20.jpg" alt="FIGURE: Full-screen photo on dive profile" />

 </div>

 </div>

 </div>

 <div class="sect3">

-<h4 id="_the_em_photos_em_tab">4.5.3. The <em>Photos</em> tab</h4>

+<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>

 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

@@ -2275,7 +2357,7 @@ it (single-click) and then by pressing the <em>Del</em> key on the keyboard. Thi
 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">4.5.4. Photos on an external hard disk</h4>

+<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

 (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

@@ -2287,13 +2369,202 @@ In addition the <em>Photos</em> tab only shows the file names of the photos. Thi
 If, later, the external drive with the photos is connected again, the photos can be seen in the normal way.</p></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="_sidemount_dives">5.6.1. Sidemount dives</h4>

+<div class="paragraph"><p><em>Subsurface</em> easily handles dives involving more than one cylinder. Sidemount dive logging involves

+three steps:</p></div>

+<div class="ulist"><ul>

+<li>

+<p>

+<strong>During the dive, recording 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

+  <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.

+</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

+  image below where two 12 litre cylinder were used).

+</p>

+</li>

+<li>

+<p>

+<strong>Indicate cylinder change events on the <em>Subsurface</em> dive profile</strong>. Once the dive log has been imported

+  from a dive computer into <em>Subsurface</em>, the cylinder switch events need to be indicated on the dive profile.

+  Cylinder changes are recorded by right-clicking at the appropriate point on the dive profile and then

+  selecting <em>Add gas change</em>. A list of the appropriate cylinders is shown with the

+  currently used cylinder greyed out. In the image below Tank 1 is greyed out, leaving only Tank 2

+  to be selected. Select the appropriate cylinder. The cylinder change is then indicated on the dive

+  profile with a cylinder symbol. If the <strong>Tank Bar</strong> is activated using the toolbar to the left of the

+  profile, then the cylinder change is also indicated on the Tank Bar (see image below). After all

+  the cylinder change events have been recorded on the dive profile, the correct cylinder pressures

+  for both cylinders are shown on the dive profile, as inthe image below.

+</p>

+</li>

+</ul></div>

+<div class="imageblock" style="text-align:center;">

+<div class="content">

+<img src="images/sidemount1.jpg" alt="FIGURE: Sidemount profile" />

+</div>

+</div>

+<div class="paragraph"><p>This section gives an example of the versatility of <em>Subsurface</em> as a give logging tool.</p></div>

+</div>

+<div class="sect3">

+<h4 id="S_CCR_dives">5.6.2. Closed circuit rebreather (CCR) dives</h4>

+<div class="admonitionblock">

+<table><tr>

+<td class="icon">

+<img src="images/APD.jpg" alt="Note" />

+</td>

+<td class="content">Closed system rebreathers use advanced technology to recirculate

+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

+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>

+</tr></table>

+</div>

+<div class="sect4">

+<h5 id="_import_a_ccr_dive">Import a CCR dive</h5>

+<div class="paragraph"><p>See the section dealing with <a href="#S_ImportingAlienDiveLogs">Importing dive information from other

+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

+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>

+</div>

+<div class="sect4">

+<h5 id="_displayed_information_for_a_ccr_dive">Displayed information for a CCR dive</h5>

+<div class="paragraph"><p><em>Partial pressures of gases</em>: The graph of oxygen partial pressure shows the

+information from the oxygen sensors of the CCR equipment. In contrast to recreational

+equipment (where pO<sub>2</sub> values are calculated based on gas composition and dive depth),

+CCR equipment provide actual measurements of pO<sub>2</sub>, derived from oxygen sensors.

+In this case the graph for oxygen partial pressure

+should be fairly flat, reflecting the setpoint settings during the dive. The mean

+pO<sub>2</sub> is NOT the mean oxygen partial pressure as given by the CCR equipment, but

+a value calculated by <em>Subsurface</em> as follows:</p></div>

+<div class="ulist"><ul>

+<li>

+<p>

+For TWO O<sub>2</sub> sensors the mean value of the two sensors are given.

+</p>

+</li>

+<li>

+<p>

+For THREE-sensor systems (e.g. APD), the mean value is also used. However

+  differences of more than 0,1 bar in the simultaneous readings of different sensors are

+  treated as spurious. If one of the three sensors provides spurious data, it is ignored.

+</p>

+</li>

+<li>

+<p>

+If no sensor data is available, the pO<sub>2</sub> value is assumed to be equal to the setpoint.

+</p>

+</li>

+</ul></div>

+<div class="paragraph"><p>The mean pO<sub>2</sub> of the sensors is indicated with a green line,</p></div>

+<div class="paragraph"><p>The oxygen setpoint values as well as the readings from the individual

+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 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;">

+<div class="content">

+<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

+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>

+<div class="imageblock" style="text-align:center;">

+<div class="content">

+<img src="images/CCR_setpoint_f20.jpg" alt="FIGURE: CCR setpoint and po2 graph" />

+</div>

+</div>

+<div class="paragraph"><p>The second checkbox allows the display of the data from each individual oxygen sensor

+of the CCR equipment. The data for each sensor is colour-coded as follows:</p></div>

+<div class="ulist"><ul>

+<li>

+<p>

+Sensor 1: grey

+</p>

+</li>

+<li>

+<p>

+Sensor 2: blue

+</p>

+</li>

+<li>

+<p>

+Sensor 3: brown

+</p>

+</li>

+</ul></div>

+<div class="paragraph"><p>The mean oxygen pO<sub>2</sub> is indicated by the green line. This allows the direct comparison

+of data from each of the oxygen sensors, useful for detecting abnormally low or erratic

+readings from a particular sensor.</p></div>

+<div class="imageblock" style="text-align:center;">

+<div class="content">

+<img src="images/CCR_sensor_data_f20.jpg" alt="FIGURE: CCR sensor data graph" />

+</div>

+</div>

+<div class="paragraph"><p>The setpoint data can be overlaid on the oxygen sensor data by activating both of the above

+check boxes. Partial pressures for nitrogen (and helium, if applicable) are shown in the

+usual way as for open circuit dives.</p></div>

+<div class="paragraph"><p><em>Events</em>: Several events are logged, e.g. switching the mouthpiece to open circuit.

+These events are indicated by yellow triangles and, if one hovers over a triangle,

+a description of that event is given as the bottom line in the <a href="#S_InfoBox">Information Box</a>.</p></div>

+<div class="paragraph"><p><em>Cylinder pressures</em>: Some CCR dive computers like the Poseidon MkVI record the

+pressures of the oxygen and diluent cylinders. The pressures of these two cylinders

+are shown as green lines overlapping the depth profile. In addition, start and

+end pressures for both oxygen and diluent cylinders are shown in the <em>Equipment Tab</em>.

+Below is a dive profile for a CCR dive, including an overaly

+of setpoint and oxygen sensor data, as well as the cylinder pressure data. In this

+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" />

+</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>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>

+</div>

+</div>

+</div>

 </div>

 </div>

 <div class="sect1">

-<h2 id="_obtaining_more_information_about_dives_entered_into_the_logbook">5. Obtaining more information about dives entered into the logbook</h2>

+<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">5.1. The <strong>Dive Info</strong> tab (for individual dives)</h3>

+<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

 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

@@ -2312,7 +2583,21 @@ Users should refer to <a href="#SAC_CALCULATION">Appendix D</a> for more informa
 </div>

 </div>

 <div class="sect2">

-<h3 id="_the_strong_stats_strong_tab_for_groups_of_dives">5.2. The <strong>Stats</strong> tab (for groups of dives)</h3>

+<h3 id="S_ExtraDataTab">6.2. The <strong>Extra Data</strong> tab (usually for individual dives)</h3>

+<div class="paragraph"><p>When using a dive computer, it often reports several data items that cannot easily be

+presented in a standardised way because the nature of the information differs from one

+dive computer to another. These data often comprise setup information, metadata about

+a dive, battery levels, no fly times, or gradient factors used during the dive. When

+possible, this information is presented in the <strong>Extra Data</strong> tab. Below is an

+image showing extra data for a dive using a Poseidon rebreather.</p></div>

+<div class="imageblock" style="text-align:center;">

+<div class="content">

+<img src="images/ExtraDataTab_f20.jpg" alt="FIGURE: Extra Data tab" />

+</div>

+</div>

+</div>

+<div class="sect2">

+<h3 id="_the_strong_stats_strong_tab_for_groups_of_dives">6.3. The <strong>Stats</strong> tab (for groups of dives)</h3>

 <div class="paragraph"><p>The Stats tab gives summary statistics for more than one dive, assuming that

 more than one dive has been selected in the <strong>Dive List</strong> using the standard

 Ctrl-click or Shift-click of the mouse. If only one

@@ -2324,7 +2609,7 @@ water temperature and surface air consumption (SAC). It also shows the depth of
 shallowest and deepest dives of those selected.</p></div>

 </div>

 <div class="sect2">

-<h3 id="S_DiveProfile">5.3. The <strong>Dive Profile</strong></h3>

+<h3 id="S_DiveProfile">6.4. The <strong>Dive Profile</strong></h3>

 <div class="imageblock" style="text-align:center;">

 <div class="content">

 <img src="images/Profile2.jpg" alt="Typical dive profile" />

@@ -2398,7 +2683,9 @@ frequently increases the size of the dive profile to fill the area of the panel
 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

-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

+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

 partial pressure graphs are shown below the profile data.</p></div>

 <div class="admonitionblock">

 <table><tr>

@@ -2557,6 +2844,22 @@ compartments following the Bühlmann model (<strong>B</strong> in figure below).
 <div class="admonitionblock">

 <table><tr>

 <td class="icon">

+<img src="images/icons/ShowCylindersButton.jpg" alt="Note" />

+</td>

+<td class="content">By selecting this icon, the different cylinders used during a dive can be represented as a coloured bar at the bottom

+of the <strong>Dive Profile</strong>. In general oxygen is represented by a green bar, nitrogen with a yellow bar and helium with a

+red bar. The image below shows a dive which first uses a trimix cylinder (red and green), followed by a switch to a nitrox cylinder

+(yellow and green) after 23 minutes. Cylinders with air are shown as a light blue bar.</td>

+</tr></table>

+</div>

+<div class="imageblock" style="text-align:center;">

+<div class="content">

+<img src="images/ShowCylinders_f20.jpg" alt="Figure: Cylinder use graph" />

+</div>

+</div>

+<div class="admonitionblock">

+<table><tr>

+<td class="icon">

 <img src="images/tissues.jpg" alt="Note" />

 </td>

 <td class="content">Display inert gas tissue pressures relative to ambient inert gas pressure (horizontal grey line).

@@ -2595,21 +2898,26 @@ during the dive. For more information external to this manual see:</p></div>
 </ul></div>

 </div>

 <div class="sect2">

-<h3 id="_the_dive_profile_context_menu">5.4. The Dive Profile context menu</h3>

+<h3 id="_the_dive_profile_context_menu">6.5. The Dive Profile context menu</h3>

 <div class="paragraph"><p>The context menu for the Dive Profile is accessed by right-clicking while the

 mouse cursor is over the Dive Profile panel. The menu allows the creation of

-Bookmarks or Gas Change Event markers other than the ones that might have been

+Bookmarks or Gas Change Event markers or manual CCR set-point changes other than the ones that might have been

 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

-open a further selection of which gas is being switched to, the list based on

-the available gases defined in the Equipment Tab. By right-clicking while over

-an existing marker, the menu extends adding options to allow deletion of the

+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

+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

+indicates the use of a closed circuit rebreather (CCR).

+By right-clicking while over

+an existing marker a menu appears, adding options to allow deletion of the

 marker or to allow all markers of that type to be hidden. Hidden events can be

 restored to view by selecting Unhide all events from the context menu.</p></div>

 </div>

 <div class="sect2">

-<h3 id="_the_strong_information_box_strong">5.5. The <strong>Information Box</strong></h3>

+<h3 id="S_InfoBox">6.6. The <strong>Information Box</strong></h3>

 <div class="paragraph"><p>The Information box displays a large range of information pertaining to the dive

 profile. Normally the Information Box is located to the top left of the <strong>Dive

 Profile</strong> panel. If the mouse points outside of the <strong>Dive Profile</strong> panel, then

@@ -2702,7 +3010,7 @@ air diving at a depth equalling the END.</td>
 </div>

 <div class="paragraph"><p>Figure (<strong>B</strong>) above shows an information box with a nearly complete set of data.</p></div>

 <div class="sect3">

-<h4 id="S_gas_pressure_graph">5.5.1. The Gas Pressure Bar Graph</h4>

+<h4 id="S_gas_pressure_graph">6.6.1. The Gas Pressure Bar Graph</h4>

 <div class="paragraph"><p>On the left of the <strong>Information Box</strong> is a vertical bar graph indicating the

 pressures of the nitrogen (and other inert gases, e.g. helium, if applicable) that the diver

 was inhaling <em>at a particular instant during the dive</em>, indicated by the position

@@ -2717,40 +3025,40 @@ meaning of the different parts of the Gas Pressure Bar Graph.</p></div>
 <li>

 <p>

 The light green area indicates the total gas, with the top margin of the light green

-area indicating the total gas pressure inhaled by the diver and measured from the bottom

-of the graph to the top of the light green area. This pressure has a <em>relative</em> value in the graph

-and does not indicate absolute pressure.

+  area indicating the total gas pressure inhaled by the diver and measured from the bottom

+  of the graph to the top of the light green area. This pressure has a <em>relative</em> value in the graph

+  and does not indicate absolute pressure.

 </p>

 </li>

 <li>

 <p>

 The horizontal black line underneath the light green margin indicates the equilibrium pressure

-of the inert gases inhaled by the diver, usually nitrogen. In

-the case of trimix, it is the pressures of nitrogen and helium combined. In this example,

-the user is diving with EAN32, so the inert gas pressure is 68% of the distance from the

-bottom of the graph to the total gas pressure value.

+  of the inert gases inhaled by the diver, usually nitrogen. In

+  the case of trimix, it is the pressures of nitrogen and helium combined. In this example,

+  the user is diving with EAN32, so the inert gas pressure is 68% of the distance from the

+  bottom of the graph to the total gas pressure value.

 </p>

 </li>

 <li>

 <p>

 The dark green area at the bottom of the graph represents the pressures of inert gas in each

-of the 16 tissue compartments, following the Bühlmann algorithm, the fast tissues being on the

-left hand side.

+  of the 16 tissue compartments, following the Bühlmann algorithm, the fast tissues being on the

+  left hand side.

 </p>

 </li>

 <li>

 <p>

-The top black horizontal line indicates the 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

-Panel</strong> of <strong>Subsurface</strong>.

+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

+  Panel</strong> of <strong>Subsurface</strong>.

 </p>

 </li>

 <li>

 <p>

 The bottom margin of the red area in the graph indicates the Bühlman-derived M-value, that is the

-pressure value of inert gases at which bubble formation is expected to be severe, resulting

-in decompression sickness.

+  pressure value of inert gases at which bubble formation is expected to be severe, resulting

+  in decompression sickness.

 </p>

 </li>

 </ul></div>

@@ -2760,38 +3068,38 @@ during a dive is indicated on the right hand side of the above figure for a dive
 <li>

 <p>

 Graph <strong>A</strong> indicates the situation at the start of a dive with diver at the surface. The pressures in all

-the tissue compartments are still at the quilibrium pressure because no diving has taken place.

+  the tissue compartments are still at the equilibrium pressure because no diving has taken place.

 </p>

 </li>

 <li>

 <p>

 Graph <strong>B</strong> indicates the situation after a descent to 30 meters. Few of the tissue compartments have had

-time to respond to the descent, their gas pressures being far below the equilibrium gas pressure.

+  time to respond to the descent, their gas pressures being far below the equilibrium gas pressure.

 </p>

 </li>

 <li>

 <p>

 Graph <strong>C</strong> represents the pressures after 30 minutes at 30 m. The fast compartments have attained

-equilibrium (i.e. they have reached the hight of the black line indicating the equilibrium pressure). The

-slower compartments (towards the right) have not reached equilibrium and are in the process of slowly

-increasing in pressure.

+  equilibrium (i.e. they have reached the hight of the black line indicating the equilibrium pressure). The

+  slower compartments (towards the right) have not reached equilibrium and are in the process of slowly

+  increasing in pressure.

 </p>

 </li>

 <li>

 <p>

 Graph <strong>D</strong> shows the pressures after ascent to a depth of 4.5 meters. Since, during ascent, the total

-inhaled gas pressure has decreased strongly from 4 bar to 1.45 bar, the pressures in the different tissue

-compartments now exceed that of the total gas pressure and approaches the gradient factor value (i.e.

-the top black horizontal line). Further ascent will result in exceeding the gradient

-factor value (GFHigh), endangering the diver.

+  inhaled gas pressure has decreased strongly from 4 bar to 1.45 bar, the pressures in the different tissue

+  compartments now exceed that of the total gas pressure and approaches the gradient factor value (i.e.

+  the top black horizontal line). Further ascent will result in exceeding the gradient

+  factor value (GFHigh), endangering the diver.

 </p>

 </li>

 <li>

 <p>

 Graph <strong>E</strong> indicates the situation after remaining at 4.5 meters for 10 minutes. The fast compartments

-have decreased in pressure. As expected, the pressures in the slow compartments have not changed much.

-The pressures in the fast compartments do not approach the GFHigh value any more and the diver is safer

-than in the situation indicated in graph <strong>D</strong>.

+  have decreased in pressure. As expected, the pressures in the slow compartments have not changed much.

+  The pressures in the fast compartments do not approach the GFHigh value any more and the diver is safer

+  than in the situation indicated in graph <strong>D</strong>.

 </p>

 </li>

 </ul></div>

@@ -2800,10 +3108,10 @@ than in the situation indicated in graph <strong>D</strong>.
 </div>

 </div>

 <div class="sect1">

-<h2 id="_organising_the_logbook_manipulating_groups_of_dives">6. Organising the logbook (Manipulating groups of dives)</h2>

+<h2 id="_organising_the_logbook_manipulating_groups_of_dives">7. Organising the logbook (Manipulating groups of dives)</h2>

 <div class="sectionbody">

 <div class="sect2">

-<h3 id="_the_dive_list_context_menu">6.1. The Dive List context menu</h3>

+<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>

@@ -2814,21 +3122,21 @@ 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">6.1.1. Customising the information showed in the <strong>Dive List</strong> panel</h4>

-<div class="imageblock" style="text-align:left;">

+<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>

+<div class="imageblock" style="text-align:center;">

 <div class="content">

 <img src="images/DiveListOptions.jpg" alt="Example: Dive list info options" />

 </div>

 </div>

 <div class="paragraph"><p>The default information in the <strong>Dive List</strong> includes, for each dive, Dive_number, Date, Rating, Dive_depth,

-Dive_duration and Dive_location. This information can be contolled and changed by right-clicking on the

+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">6.1.2. Selecting dives from a particular dive site</h4>

+<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

@@ -2836,20 +3144,20 @@ show only the dives for that site.</p></div>
 </div>

 </div>

 <div class="sect2">

-<h3 id="S_Renumber">6.2. Renumbering the dives</h3>

+<h3 id="S_Renumber">7.2. Renumbering the dives</h3>

 <div class="paragraph"><p>Dives are normally numbered incrementally from non-recent dives (low sequence

 numbers) to recent dives (having the highest sequence numbers). The numbering

 of the dives is not always consistent. For instance, when non-recent dives are

 added to the dive list the numbering does not automatically follow on because

 of the dives that are more recent in date/time than the newly-added dive with

 an older date/time. Therefore, one may sometimes need to renumber the dives.

-This is performed by selecting (from the Main Menu) <em>Log &#8594; Renumber</em>. Users are

+This is performed by selecting (from the Main Menu) <em>Log &#8594;  Renumber</em>. Users are

 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>

 <div class="sect2">

-<h3 id="S_Group">6.3. Grouping dives into trips and manipulating trips</h3>

+<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

@@ -2863,10 +3171,10 @@ 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) users must 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">6.3.1. Editing the title and associated information for a particular trip</h4>

+<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

@@ -2880,26 +3188,26 @@ tab. The trip title in the <strong>Dive List</strong> panel should now reflect s
 edited information.</p></div>

 </div>

 <div class="sect3">

-<h4 id="_viewing_the_dives_during_a_particular_trip">6.3.2. Viewing the dives during a particular trip</h4>

+<h4 id="_viewing_the_dives_during_a_particular_trip">7.3.2. Viewing the dives during a particular trip</h4>

 <div class="paragraph"><p>Once the dives have been grouped into trips, users can expand one or more

 trips by clicking the arrow-head on the left of each trip title. This expands

 the selected trip, revealing the individual dives performed during the trip.</p></div>

 </div>

 <div class="sect3">

-<h4 id="_collapsing_or_expanding_dive_information_for_different_trips">6.3.3. Collapsing or expanding dive information for different trips</h4>

+<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>

 <div class="sect3">

-<h4 id="_merging_dives_from_more_than_one_trip_into_a_single_trip">6.3.4. Merging dives from more than one trip into a single trip</h4>

+<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>

 <div class="sect3">

-<h4 id="_splitting_a_single_trip_into_more_than_one_trip">6.3.5. Splitting a single trip into more than one trip</h4>

+<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

@@ -2916,9 +3224,9 @@ the completed action on the right (B):</p></div>
 </div>

 </div>

 <div class="sect2">

-<h3 id="_manipulating_single_dives">6.4. Manipulating single dives</h3>

+<h3 id="_manipulating_single_dives">7.4. Manipulating single dives</h3>

 <div class="sect3">

-<h4 id="_delete_a_dive_from_the_dive_log">6.4.1. Delete a dive from the dive log</h4>

+<h4 id="_delete_a_dive_from_the_dive_log">7.4.1. Delete a dive from the dive log</h4>

 <div class="paragraph"><p>Dives can be permanently deleted from the dive log by selecting and

 right-clicking them to bring up the context menu, and then selecting <strong>Delete

 dive(s)</strong>. Typically this would apply to a case where a user wishes to delete

@@ -2926,7 +3234,7 @@ workshop
 calibration dives of the dive computer or dives of extremely short duration.</p></div>

 </div>

 <div class="sect3">

-<h4 id="_unlink_a_dive_from_a_trip">6.4.2. Unlink a dive from a trip</h4>

+<h4 id="_unlink_a_dive_from_a_trip">7.4.2. Unlink a dive from a trip</h4>

 <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)

@@ -2934,7 +3242,7 @@ from trip</strong>. The dive(s) now appear immediately above the trip to
 which they belonged.</p></div>

 </div>

 <div class="sect3">

-<h4 id="_add_a_dive_to_the_trip_immediately_above">6.4.3. Add a dive to the trip immediately above</h4>

+<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

@@ -2942,7 +3250,7 @@ the dive(s) to bring up the context menu, and then select <strong>Add dive(s) to
 immediately above</strong>.</p></div>

 </div>

 <div class="sect3">

-<h4 id="_shift_the_start_time_of_dive_s">6.4.4. Shift the start time of dive(s)</h4>

+<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

@@ -2954,7 +3262,7 @@ time
 option indicating whether the time adjustment should be forwards or backwards.</p></div>

 </div>

 <div class="sect3">

-<h4 id="_merge_dives_into_a_single_dive">6.4.5. Merge dives into a single dive</h4>

+<h4 id="_merge_dives_into_a_single_dive">7.4.5. Merge dives into a single dive</h4>

 <div class="paragraph"><p>Sometimes a dive is briefly interrupted, e.g. if a diver returns to the surface

 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

@@ -2971,12 +3279,12 @@ below shows the depth profile of two such dives that were merged:</p></div>
 </div>

 </div>

 <div class="sect2">

-<h3 id="_filtering_the_dive_list">6.5. Filtering the dive list</h3>

+<h3 id="S_Filter">7.5. Filtering the dive list</h3>

 <div class="paragraph"><p>The dives in the <strong>Dive List</strong> panel can be filtered, that is, one can select only some

 of the dives based on their attributes, e.g. dive tags, dive site, dive master, buddy or protective

 clothing. For instance, filtering allows one to list the deep dives at a particular

 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

+<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

@@ -3000,22 +3308,75 @@ of search terms for filtering the dive list.</p></div>
 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.

 The four check lists work as a filter with <em>AND</em> operators, Subsurface

-filters therfore  for <em>cave</em> as a tag AND <em>Joe Smith</em> as a buddy; but the

+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>

 </div>

 </div>

 </div>

 <div class="sect1">

-<h2 id="S_ExportLog">7. Exporting the dive log or parts of the dive log</h2>

+<h2 id="S_ExportLog">8. Exporting the dive log or parts of the dive log</h2>

 <div class="sectionbody">

-<div class="paragraph"><p>The export function can be reached by selecting <em>File &#8594; Export</em>, which brings up

+<div class="paragraph"><p>There are two routes for the export of dive information from Subsurface:</p></div>

+<div class="ulist"><ul>

+<li>

+<p>

+Export dive information to <em>Facebook</em>

+</p>

+</li>

+<li>

+<p>

+<a href="#S_Export_other">Export dive information to other destinations or formats</a>

+</p>

+</li>

+</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

+<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>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

+<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,

+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

+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

+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>

+<div class="sect2">

+<h3 id="S_Export_other">8.2. Export dive information  to other destinations or formats</h3>

+<div class="paragraph"><p>For non-<em>Facebook exports</em>, the export function can be reached by selecting <em>File &#8594;  Export</em>, which brings up

 the Export dialog. This dialog always gives two options: save ALL dives, or save only

 the dives selected in <strong>Dive List</strong> panel of <em>Subsurface</em>. Click the appropriate

 radio button (see images below).</p></div>

 <div class="imageblock" style="text-align:center;">

 <div class="content">

-<img src="images/Export.jpg" alt="Figure: Export dialog" />

+<img src="images/Export_f20.jpg" alt="Figure: Export dialog" />

 </div>

 </div>

 <div class="paragraph"><p>A dive log or part of it can be saved in three formats:</p></div>

@@ -3028,39 +3389,74 @@ radio button (see images below).</p></div>
 <li>

 <p>

 Universal Dive Data Format (<em>UDDF</em>). Refer to <em>http://uddf.org</em> for more information.

-UDDF is a generic format that enables communication among many dive computers

-and computer programs.

+  UDDF is a generic format that enables communication among many dive computers

+  and computer programs.

 </p>

 </li>

 <li>

 <p>

 <em>Divelogs.de</em>, an Internet-based dive log repository. In order to upload to <em>Divelogs.de</em>,

-one needs a user-ID as well as a password for <em>Divelogs.de</em>. Log into <em>http://en.divelogs.de</em>

-and subscribe to this service in order to upload dive log data from <em>Subsurface</em>.

+  one needs a user-ID as well as a password for <em>Divelogs.de</em>. Log into <em>http://en.divelogs.de</em>

+  and subscribe to this service in order to upload dive log data from <em>Subsurface</em>.

 </p>

 </li>

 <li>

 <p>

-<em>CSV</em> format, that includes the most critical information of the dive

-profile. Included information of a dive is: dive number, date, time,

-duration, depth, temperature and pressure.

+<em>DiveShare</em> is also a dive log repostory on the Internet focusing on the recreational

+  dives. In order to upload dives one has to provide a used ID, so registration with

+  <em>http://scubadiveshare.com</em> is required.

 </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.

+<em>CSV dive details</em>, that includes the most critical information of the dive

+  profile. Included information of a dive is: dive number, date, time, buddy,

+  duration, depth, temperature and pressure: in short, most of the information

+  that recreational divers enter into handwritten log books.

+</p>

+</li>

+<li>

+<p>

+<em>CSV dive profile</em>, that includes a large amount of detail for each dive, including

+  the depth profile, temperature and pressure information of each dive.

 </p>

 </li>

 <li>

 <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 generated 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

-option to search the dive log. HTML export is specified on the second tab of the

-Export dialog (image <strong>B</strong> above).

+  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

+  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

+  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

+  of the dive sites on the map, a summary of the dive is available in text, as shown

+  in the image below.

+</p>

+</li>

+</ul></div>

+<div class="imageblock" style="text-align:center;">

+<div class="content">

+<img src="images/mapview_f20.jpg" alt="Figure: HTML Map export view" />

+</div>

+</div>

+<div class="ulist"><ul>

+<li>

+<p>

+<em>Image depths</em>, which creates a text file that contains the file names of all

+  photos or images  attached

+  to any of the selected dives in the <em>Dive List</em>, together with the depth under water where

+  of each of those photos were taken.

 </p>

 </li>

 <li>

@@ -3071,20 +3467,20 @@ Export dialog (image <strong>B</strong> above).
 <li>

 <p>

 Subsurface Numbers: if this option is checked, the dive(s) are exported with the

-numbers associated with them in Subsurface, Otherwise the dive(s) will be numbered

-starting from 1.

+   numbers associated with them in Subsurface, Otherwise the dive(s) will be numbered

+   starting from 1.

 </p>

 </li>

 <li>

 <p>

 Export Yearly Statistics: if this option is checked, a yearly statistics table will

-be attached with the HTML exports.

+   be attached with 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.

+   information will not be available.

 </p>

 </li>

 </ul></div>

@@ -3092,7 +3488,7 @@ information will not be available.
 <li>

 <p>

 Under <em>Style Options</em> some style-related options are available like font

-size and theme.

+  size and theme.

 </p>

 </li>

 </ul></div>

@@ -3100,8 +3496,9 @@ size and theme.
 instance <em>www.divelogs.de</em>.</p></div>

 </div>

 </div>

+</div>

 <div class="sect1">

-<h2 id="S_Cloud_access">8. Keeping a <em>Subsurface</em> dive log in the Cloud</h2>

+<h2 id="S_Cloud_access">9. Keeping a <em>Subsurface</em> dive log in the Cloud</h2>

 <div class="sectionbody">

 <div class="paragraph"><p>For each diver, dive log information is highly important. Not only is it a record

 of diving activities for one&#8217;s own pleasure, but it is important information required

@@ -3137,9 +3534,9 @@ 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 in the Cloud, 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 the Cloud, 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

@@ -3147,7 +3544,7 @@ process could be used for the Cloud-based storage of dive logs.</p></div>
 </div>

 </div>

 <div class="sect1">

-<h2 id="S_PrintDivelog">9. Printing a dive log</h2>

+<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>

@@ -3156,17 +3553,17 @@ few selected dives, including dive profiles and other contextual information.</p
 <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 the user must 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.

+  the appropriate toggle-buttons on the button bar to the left of the Dive Profile 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

+<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="imageblock" style="text-align:center;">

@@ -3184,19 +3581,19 @@ Print the complete Dive List: to do this, <em>Table Print</em> should be selecte
 <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>.

+  dives per printed page: to do this, users should select <em>6 dives per page</em>.

 </p>

 </li>

 <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>.

+  dives per printed page: to do this, users should select <em>2 dives per page</em>.

 </p>

 </li>

 <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>.

+  dive per printed page: to do this, users should select <em>1 dive per page</em>.

 </p>

 </li>

 </ul></div>

@@ -3205,8 +3602,8 @@ dive per printed page: to do this, users should select <em>1 dive per page</em>.
 <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>.

+  activating the print dialogue, achieved by checking the box <em>Print only

+  selected dives</em>.

 </p>

 </li>

 <li>

@@ -3241,83 +3638,136 @@ the output for one particular page.</p></div>
 </div>

 </div>

 <div class="sect1">

-<h2 id="S_Preferences">10. Setting user <em>Preferences</em> for <em>Subsurface</em></h2>

+<h2 id="S_Configure">11. Configuring a dive computer</h2>

+<div class="sectionbody">

+<div class="paragraph"><p><em>Subsurface</em> enables one to configure a dive computer. Currently the Heinrichs-Weikamp (OSTC 2, OSTC 3) and

+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.

+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>

+<div class="imageblock" style="text-align:center;">

+<div class="content">

+<img src="images/Configure_dc_f20.jpg" alt="FIGURE: Configure dive computer" />

+</div>

+</div>

+<div class="paragraph"><p>Using the appropriate buttons on the configuration panel, the following actions can be performed:</p></div>

+<div class="ulist"><ul>

+<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.

+</p>

+</li>

+<li>

+<p>

+<strong>Save changes to device</strong>. This changes the configuration of the

+   dive computer to correspond to the information shown in the configuration panel.

+</p>

+</li>

+<li>

+<p>

+<strong>Backup</strong>. This saves the configuration data to a file. <em>Subsurface</em> asks for

+   a file location and file name for the saved information.

+</p>

+</li>

+<li>

+<p>

+<strong>Restore backup</strong>. This loads the information from a backup file and displays it

+   in the configuration panel.

+</p>

+</li>

+<li>

+<p>

+<strong>Update firmware</strong>. If new firmware is available for the dive computer, this is

+   loaded into the dive computer.

+</p>

+</li>

+</ul></div>

+</div>

+</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

+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

 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>

 <div class="sect2">

-<h3 id="_defaults">10.1. Defaults</h3>

+<h3 id="_defaults">12.1. Defaults</h3>

 <div class="paragraph"><p>There are several settings in the <strong>Defaults</strong> panel:</p></div>

 <div class="imageblock" style="text-align:center;">

 <div class="content">

-<img src="images/Pref1.jpg" alt="FIGURE: Preferences defaults page" />

+<img src="images/Pref1_f20.jpg" alt="FIGURE: Preferences defaults page" />

 </div>

 </div>

 <div class="ulist"><ul>

 <li>

 <p>

 <strong>Lists and tables</strong>: Here one can specify the font type and font size of the

-<strong>Dive Table</strong> panel. By decreasing the font size of the <strong>Dive Table</strong>, users can see more dives on a screen.

+     <strong>Dive Table</strong> panel. By decreasing the font size of the <strong>Dive Table</strong>, users can see more dives on a screen.

 </p>

 </li>

 <li>

 <p>

 <strong>Dives</strong>: For the <em>Default Dive File</em> one need 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.

+     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.

 </p>

 </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

-keep them in the dive log). This controls whether those dives are displayed in

-the dive list.

+     dives that he/she don&#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.

+     the <strong>Equipment</strong> tab of the <strong>Dive Notes</strong> panel.

 </p>

 </li>

 <li>

 <p>

 <strong>Animations</strong>: Some actions in showing the dive profile are performed using

-animations. For instance, the axis values for depth and time change from dive to

-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

-at all.

+     animations. For instance, the axis values for depth and time change from dive to

+     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

+     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.

+     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.

+     cleared and set to default values.

 </p>

 </li>

 </ul></div>

 </div>

 <div class="sect2">

-<h3 id="_units">10.2. Units</h3>

+<h3 id="_units">12.2. Units</h3>

 <div class="imageblock" style="text-align:center;">

 <div class="content">

-<img src="images/Pref2.jpg" alt="FIGURE: Preferences Units page" />

+<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,

@@ -3327,10 +3777,10 @@ Alternatively, if one selects the <strong>Personalise</strong> radio button, uni
 independently, with some units in the metric system and others in imperial.</p></div>

 </div>

 <div class="sect2">

-<h3 id="_graph">10.3. Graph</h3>

-<div class="imageblock" style="text-align:center;">

+<h3 id="_graph">12.3. Graph</h3>

+<div class="imageblock" id="S_CCR_options" style="text-align:center;">

 <div class="content">

-<img src="images/Pref3.jpg" alt="FIGURE: Preferences Graph page" />

+<img src="images/Pref3_f20.jpg" alt="FIGURE: Preferences Graph page" />

 </div>

 </div>

 <div class="paragraph" id="S_GradientFactors"><p>This panel allows two type of selections:</p></div>

@@ -3338,24 +3788,24 @@ independently, with some units in the metric system and others in imperial.</p><
 <li>

 <p>

 <strong>Show</strong>: Here users can specify the amount of information shown as part of

-the dive profile:

+  the dive profile:

 </p>

 <div class="ulist"><ul>

 <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>

-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.

+   the dive. These are enabled 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.

 </p>

 </li>

 <li>

 <p>

 <em>Draw dive computer reported ceiling red</em>: This checkbox allows exactly what it says.

-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

-dive computer can calculate ceilings during a dive.

+   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

+   dive computer can calculate ceilings during a dive.

 </p>

 </li>

 <li>

@@ -3366,7 +3816,7 @@ dive computer can calculate ceilings during a dive.
 <li>

 <p>

 <em>Show average depth</em>: Activating this checkbox causes <em>Subsurface</em> to draw a red line across

-the dive profile, indicating the mean depth of the dive.

+   the dive profile, indicating the mean depth of the dive.

 </p>

 </li>

 </ul></div>

@@ -3379,18 +3829,18 @@ the dive profile, indicating the mean depth of the dive.
 <li>

 <p>

 Gradient Factors:* Here users can 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

-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:

+   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

+   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>

-</li>

+<div class="ulist"><ul>

 <li>

 <p>

 <a href="http://www.tek-dive.com/portal/upload/M-Values.pdf">Understanding M-values by Erik Baker, <em>Immersed</em> Vol. 3, No. 3.</a>

@@ -3403,14 +3853,60 @@ all depths deeper than the first deco stop. For more information see:
 </li>

 </ul></div>

 </li>

+<li>

+<p>

+<em>CCR: Show setpoints when viewing pO2:</em> With this checkbox ativated, the pO<sub>2</sub>

+    graph on the dive profile has an overlay in red which inticates the CCR setpoint

+    values. See the section on <a href="#S_CCR_dives">Closed Circuit Rebreather dives</a>.

+</p>

+</li>

+<li>

+<p>

+<em>CCR: Show individual O<sub>2</sub> sensor values when viewing pO<sub>2</sub>:</em> Show the pO<sub>2</sub>

+    values associated with each of the individual oxygen sensors of a CCR system.

+    See the section on <a href="#S_CCR_dives">Closed Circuit Rebreather dives</a>.

+</p>

+</li>

+</ul></div>

+</li>

+<li>

+<p>

+<strong>Configuring dive planning using rebreather equipment:</strong>

+</p>

+<div class="ulist"><ul>

+<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

+    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

+    and decompression calculations.

+</p>

+</li>

+<li>

+<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.

+</p>

+</li>

+</ul></div>

+</li>

 </ul></div>

 </div>

 <div class="sect2">

-<h3 id="_language">10.4. Language</h3>

+<h3 id="_language">12.4. Language</h3>

 <div class="paragraph"><p>Choose a language that <em>Subsurface</em> will use.</p></div>

 <div class="imageblock" style="text-align:center;">

 <div class="content">

-<img src="images/Pref4.jpg" alt="FIGURE: Preferences Language page" />

+<img src="images/Pref4_f20.jpg" alt="FIGURE: Preferences Language page" />

 </div>

 </div>

 <div class="paragraph"><p>A checkbox allows one to use the <em>System Default</em> language which in most cases

@@ -3423,11 +3919,11 @@ or French. This particular preference requires a restart of <em>Subsurface</em>
 effect.</p></div>

 </div>

 <div class="sect2">

-<h3 id="_network">10.5. Network</h3>

+<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="imageblock" style="text-align:center;">

 <div class="content">

-<img src="images/Pref5.jpg" alt="FIGURE: Preferences Network page" />

+<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

@@ -3442,14 +3938,31 @@ 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>

 </div>

+<div class="sect2">

+<h3 id="_facebook_accesss">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;">

+<div class="content">

+<img src="images/Pref6_f20.jpg" alt="FIGURE: Facebook login panel" />

+</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",

+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>

 </div>

 <div class="sect1">

-<h2 id="S_DivePlanner">11. The <em>Subsurface</em> dive planner</h2>

+<h2 id="S_DivePlanner">13. The <em>Subsurface</em> dive planner</h2>

 <div class="sectionbody">

-<div class="paragraph"><p>Dive planning is an advanced feature of <em>Subsurface</em>, accessible by selecting <em>Log &#8594; Plan Dive</em> from the main menu. It allows calculation of

-nitrogen load during a dive by using the Bühlmann ZH-L16 algorithm with the addition of gradient factors as

-implemented by Erik Baker.</p></div>

+<div class="paragraph"><p>Dive planning is an advanced feature of <em>Subsurface</em>, accessible by selecting

+<em>Log &#8594;  Plan Dive</em> from the main menu. It allows calculation of

+nitrogen load during a dive by using the Bühlmann ZH-L16 algorithm with the addition

+of gradient factors as implemented by Erik Baker.</p></div>

 <div class="sidebarblock">

 <div class="content">

 <div class="admonitionblock">

@@ -3466,7 +3979,7 @@ user interface. It is explicitly used under the following conditions:</td>
 <li>

 <p>

 The user is conversant with dive planning and has the necessary training to perform

-dive planning.

+  dive planning.

 </p>

 </li>

 <li>

@@ -3477,8 +3990,8 @@ The user plans dives within his/her certification limits.
 <li>

 <p>

 Dive planning makes large assumptions about the characteristics of the <em>average person</em>

-and cannot compensate for individual physiology or health or personal history or

-life style characteristics.

+  and cannot compensate for individual physiology or health or personal history or

+  life style characteristics.

 </p>

 </li>

 <li>

@@ -3494,13 +4007,13 @@ The user is familiar with the user interface of <em>Subsurface</em>.
 <li>

 <p>

 A user who is not absolutely sure about any of the above requirements should not use

-this feature.

+  this feature.

 </p>

 </li>

 </ul></div>

 </div></div>

 <div class="sect2">

-<h3 id="_the_em_subsurface_em_dive_planner_screen">11.1. The <em>Subsurface</em> dive planner screen</h3>

+<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>

@@ -3512,70 +4025,72 @@ the dive plan are provided in a way that can easily be copied to other software.
 any warning messages about the dive plan are printed.</p></div>

 <div class="imageblock" style="text-align:center;">

 <div class="content">

-<img src="images/PlannerWindow1.jpg" alt="FIGURE: Dive planner startup window" />

+<img src="images/PlannerWindow1_f20.jpg" alt="FIGURE: Dive planner startup window" />

 </div>

 </div>

 </div>

 <div class="sect2">

-<h3 id="_initiating_dive_planning">11.2. Initiating dive planning</h3>

-<div class="paragraph"><p>The dive planner comprises two parts: <strong>constructing a dive plan</strong> and <strong>evaluating</strong>

-that dive plan. To perform dive planning, perform these steps:</p></div>

+<h3 id="_open_circuit_dives_as_an_example_of_dive_planning">13.2. Open circuit dives as an example of dive planning</h3>

 <div class="ulist"><ul>

 <li>

 <p>

-Clear the existing dive log by creating a new planning log. This is achieved by selecting

-<em>File &#8594; New logbook</em> from the main menu. This way, dive plans are kept separate

-from the existing dive log of completed dives.

+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:

+</p>

+<div class="ulist"><ul>

+<li>

+<p>

+Open Circuit (the default)

+</p>

+</li>

+<li>

+<p>

+CCR

+</p>

+</li>

+<li>

+<p>

+pSCR

 </p>

 </li>

+</ul></div>

+</li>

 <li>

 <p>

-In the top left-hand area of the screen, ensure that the constant dive parameters are

-appropriate. These are: Start date and time of the 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 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

+  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.

 </p>

 </li>

 <li>

 <p>

 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 dive gas is assumed to be 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.

+  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.

 </p>

 </li>

 <li>

 <p>

 The dialogue indicating <em>Dive Planner Points</em> is usually not used at this stage of the dive

-planning.

+  planning.

 </p>

 </li>

 </ul></div>

-</div>

-<div class="sect2">

-<h3 id="_managing_nitrogen_oxygen_and_gas_consumption">11.3. Managing nitrogen, oxygen and gas consumption</h3>

-<div class="paragraph"><p>The planning is performed in three stages:</p></div>

-<div class="ulist"><ul>

-<li>

-<p>

-<strong>a) Nitrogen management</strong>: This is performed by specifying the rates for descent and ascent,

+<div class="paragraph"><p><strong>The planning is performed in three stages</strong></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>

 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 specifications in the <em>Preferences</em>. Gradient Factor settings strongly affect the calculated ceilings and their depths.

+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.

-</p>

-<div class="ulist"><ul>

-<li>

-<p>

-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>

+ ** 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>

 <div class="ulist"><ul>

 <li>

 <p>

@@ -3594,112 +4109,82 @@ An excellent non-technical review.
 </p>

 </li>

 </ul></div>

-</li>

-<li>

-<p>

-The ascent rate is critical for nitrogen off-gassing at the end of the dive and is specified

+<div class="paragraph"><p>The ascent rate is critical for nitrogen off-gassing at the end of the dive and is specified

 for several depth ranges, utilising the average (or mean) depth as a yardstick. The mean depth

-of the dive plan is indicated on the dive profile in the green panel of the dive planner. Ascent rates

+of the dive plan is indicated by a light grey line on the dive profile. Ascent rates

 at deeper levels are often in the range of 8-12 m/min, while ascent rates near the surface are

 often in the range of 4-9 m/min. The descent rate is also specified. If the option <em>Drop to first depth</em>

 is activated, then the descent phase of the planned dive will be at the maximal descent rate specified

-in the <em>Rates</em> section of the dive setup.

-</p>

-</li>

-</ul></div>

-</li>

-<li>

-<p>

-<strong>b) Oxygen management</strong>: In the <strong>Gas Options</strong> part of the dive specification, the maximum partial

+in the <em>Rates</em> section of the dive setup.</p></div>

+<div class="paragraph"><p><strong>b) Oxygen management</strong>: In the <strong>Gas Options</strong> part of the dive specification, the maximum partial

 pressure for oxygen needs to be specified for the

 bottom part of the dive (<em>bottom po2</em>) as well as for the decompression part of the dive (<em>deco po2</em>).

 The most commonly

 used values are 1.4 bar for the bottom part of the dive and 1.6 bar for any decompression

 stages. Normally, a partial pressure of 1.6 bar is not exceeded. PO2 settings and the depth at which switching to a gas takes place can also be edited in the

 <em>Available Gases</em> dialog. Normally the planner decides on switching to a new gas when, during

-ascent, the partial pressure of the new gas has decreased to 1.6 bar.

-</p>

-</li>

-<li>

-<p>

-<strong>c) Gas management</strong>: One needs keep within the limits of the amount of gas contained in the dive

-cylinder(s), allowing for an appropriate margin for safe return to the surface, possibly

+ascent, the partial pressure of the new gas has increased to 1.6 bar.</p></div>

+<div class="paragraph"><p><strong>c) Gas management</strong>: With open-circuit dives this is a primary consideration. One needs to keep within the limits of the amount of gas within the dive

+cylinder(s), allowing for an appropriate margin for a safe return to the surface, possibly

 sharing with a buddy. Under the <em>Gas Options</em> heading, specify the best (but conservative) estimate

 of your surface-equivalent air consumption (SAC, also termed RMV) in

 litres/min (for the time being, only SI units are supported).  Specify the SAC during the

 bottom part of the dive (<em>bottom SAC</em>) as well as during the decompression or safety stops of the

-dive (<em>deco SAC</em>). Values of 20-30 l/min are common. For good gas management, a thumbsuck guess

+dive (<em>deco SAC</em>). Values of 15-30 l/min are common. For good gas management, a thumbsuck guess

 is not sufficient and one needs to

 monitor one&#8217;s gas consumption on a regular basis, dependent on different dive conditions and/or equipment.

-The planner will calculate the total volume of gas used during the dive and will issue a warning

+The planner calculates the total volume of gas used during the dive and issues a warning

 if one exceeds the total amount of gas available. Good practice demands that one does not dive to

 the limit of the gas supply but that an appropriate reserve is kept for unforeseen circumstances.

-For technical diving, this reserve can be up to 66% of the total available gas.

-</p>

-</li>

-<li>

-<p>

-Now (at last) one can start the detailed time-depth planning of the dive. <em>Subsurface</em> offers a unique

+For technical diving, this reserve can be up to 66% of the total available gas.</p></div>

+<div class="paragraph"><p>Now (at last) one can start the detailed time-depth planning of the dive. <em>Subsurface</em> offers a unique

 graphical interface for performing this part of the planning. The mechanics of doing this is

 similar to hand-entering a dive profile in the dive log part of <em>Subsurface</em>. Upon activating the

-planner, a default dive of depth 15 m for 40 min is offered in the green design surface to the top

+planner, a default dive of depth 15 m for 40 min is offered in the bue design surface to the top

 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.

+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>

-</li>

-<li>

-<p>

-Each waypoint on the dive profile creates a <em>Dive Planner Point</em> in the table on the

+above the dive profile changes from BLUE to RED.</p></div>

+<div class="paragraph"><p>Each waypoint on the dive profile creates a <em>Dive Planner Point</em> in the table on the

 left of the dive planner panel. Ensure that the <em>Used Gas</em> value in each row

-of that table corresponds to one of the gas mixtures specified in the table with

-<em>Available Gases</em> immediately above the Dive Planner Points. Add new waypoints

-until the main features of the dive have been completed, e.g. the

+of that table corresponds to one of the gas mixtures specified in the <em>Available Gases</em> table.

+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 fulfil decompression requirements for that

-dive.

-</p>

-</li>

-<li>

-<p>

-A waypoint can be moved by selecting that waypoint and by using the arrow keys.

-</p>

-</li>

-<li>

-<p>

+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

-whole dive profile by editing the <em>Dive Planner Points</em> dialog.

-</p>

-</li>

-<li>

-<p>

-Indicate any changes in gas cylinder used by indicating gas changes as explained

+whole dive profile by editing the <em>Dive Planner Points</em> dialog.</p></div>

+<div class="paragraph"><p>Indicate any changes in gas cylinder used by indicating gas changes as explained

 in the section <a href="#S_CreateProfile">hand-creating a dive profile</a>. These changes should

 reflect the cylinders and gas compositions defined in the table with <em>Available Gases</em>.

 If two or more gases are used, automatic gas switches will be suggested during the ascent to

 the surface. However, these changes can be deleted by right-clicking the gas change and by

-manually creating a gas change by right-clicking on the appropriate waypoint.

-</p>

-</li>

-</ul></div>

+manually creating a gas change by right-clicking on the appropriate

+waypoint.</p></div>

+<div class="paragraph"><p>A non-zero value in the "CC set point" column of the table of dive planner points

+indicates a valid setpoint for oxygen partial pressure and that the segment

+is dived using a closed circuit rebreather (CCR). If the last manually entered

+segment is a CCR segment, the decompression phase is computed assuming the diver

+uses a CCR with the specified set-point. If the last segment (however

+short) is on open circuit (OC, indicated by a zero set-point) the

+decompression is computed in OC mode. The planner only considers gas

+changes in OC mode.</p></div>

 <div class="paragraph"><p>Below is an example of a dive plan to 45m using EAN26, followed by an ascent using EAN50

 and using the settings as described above.</p></div>

 <div class="imageblock" style="text-align:center;">

 <div class="content">

-<img src="images/DivePlanner2.jpg" alt="FIGURE: Planning a dive: setup" />

+<img src="images/DivePlanner2_f20.jpg" alt="FIGURE: Planning a dive: setup" />

 </div>

 </div>

 <div class="paragraph"><p>Once the above has been completed, one can save it by clicking the <em>Save</em> button

-towards the bottom left of the green design panel. The saved dive plan will appear

+towards the top middle of the planner. The saved dive plan will appear

 in the <strong>Dive List</strong> panel of <em>Subsurface</em>.</p></div>

-</div>

-<div class="sect2">

-<h3 id="_the_dive_plan_details">11.4. The dive plan details</h3>

+<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

@@ -3713,15 +4198,64 @@ time to get to that level. However, if the <em>Display transition in deco</em> o
 the transitions are shown separately from the segment durations at a particular level.</p></div>

 </div>

 <div class="sect2">

-<h3 id="S_Replan">11.5. Modifying an existing dive plan</h3>

+<h3 id="_planning_ccr_dives">13.3. 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

+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>

+<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">

+<img src="images/Planner_CCR1_f20.jpg" alt="FIGURE: Planning a CCR dive: setup" />

+</div>

+</div>

+<div class="paragraph"><p>Note that, in the <em>Dive plan details</em>, the gas consumption for a CCR segment is not calculated,

+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 apears 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 accross 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.

 To perform changes to a dive plan, select it on the <strong>Dive List</strong>. Then, in the main menu,

-select <em>Log &#8594; Re-plan dive</em>. This will open the selected dive plan within the dive planner,

+select <em>Log &#8594;  Re-plan dive</em>. This will open the selected dive plan within the dive planner,

 allowing changes to be made and saved as usual.</p></div>

+<div class="paragraph"><p>In addition there is the option "Save new". This keeps the original

+planned dive and adds a (possibly modified) copy to the dive list. If

+that copy is saved with the same start time as the original, the two

+dives are considered two versions of the same dive and do not

+influence other each during decompression calculation (see next section).</p></div>

 </div>

 <div class="sect2">

-<h3 id="_planning_for_repetitive_dives">11.6. Planning for repetitive dives</h3>

+<h3 id="_planning_for_repetitive_dives">13.6. Planning for repetitive dives</h3>

 <div class="paragraph"><p>Repetitive dives can easily be planned if the dates and start times of the

 repetitive dive set

 is specified appropriately in the top left-hand <em>Start Time</em> field. <em>Subsurface</em>

@@ -3738,7 +4272,7 @@ this configuration, just highlight the template dive in the <strong>Dive List</s
 planner: the planner takes into account the configuration in the highlighted dive.</p></div>

 </div>

 <div class="sect2">

-<h3 id="_printing_the_dive_plan">11.7. Printing the dive plan</h3>

+<h3 id="_printing_the_dive_plan">13.7. Printing the dive plan</h3>

 <div class="paragraph"><p>Selecting the <em>Print</em> button in the planner allows printing of the  <em>Dive Plan Details</em>

 for wet notes. Alternatively one can cut and paste the <em>Dive Plan Details</em> for

 inclusion in a text file or word processing document.</p></div>

@@ -3749,29 +4283,30 @@ the <em>Print</em> button in the dive planner. This prints the dive details and
 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

 accessed in the same way as during the planning process. The only way to print the

-dive plan is to use the <em>File&#8594;Print</em> facility on the main menu in the same way as for dive logs.</p></div>

+dive plan is to use the <em>File &#8594;  Print</em> facility on the main menu in the

+same way as for dive logs or by copy and paste to a word processor.</p></div>

 </div>

 </div>

 </div>

 <div class="sect1">

-<h2 id="_description_of_the_subsurface_main_menu_items">12. Description of the Subsurface Main Menu items</h2>

+<h2 id="_description_of_the_subsurface_main_menu_items">14. Description of the Subsurface Main Menu items</h2>

 <div class="sectionbody">

 <div class="paragraph"><p>This section describes the functions and operation of the items in the Main Menu

 of Subsurface. Several of the items below are links to sections of this manual

 dealing with the appropriate operations.</p></div>

 <div class="sect2">

-<h3 id="_file">12.1. File</h3>

+<h3 id="_file">14.1. File</h3>

 <div class="ulist"><ul>

 <li>

 <p>

 <a href="#S_NewLogbook"><em>New Logbook</em></a> - Close the currently open dive logbook and

-clear all dive information.

+  clear all dive information.

 </p>

 </li>

 <li>

 <p>

 <em>Open logbook</em> - This opens the file manager in order to select a dive

-logbook to open.

+  logbook to open.

 </p>

 </li>

 <li>

@@ -3792,7 +4327,7 @@ logbook to open.
 <li>

 <p>

 <a href="#S_ExportLog"><em>Export</em></a> -  Export the currently open dive logbook (or

-the selected dives in the logbook) to one of several formats.

+  the selected dives in the logbook) to one of several formats.

 </p>

 </li>

 <li>

@@ -3807,47 +4342,47 @@ the selected dives in the logbook) to one of several formats.
 </li>

 <li>

 <p>

-<em>Quit</em> - Quit <em>Subsurface</em>.

+<a href="#S_Configure"><em>Configure dive computer</em></a> - Edit the configuration of a dive computer.

 </p>

 </li>

 <li>

 <p>

-<em>Configure dive computer</em> - This option is currently experimental and under development.

+<em>Quit</em> - Quit <em>Subsurface</em>.

 </p>

 </li>

 </ul></div>

 </div>

 <div class="sect2">

-<h3 id="_import">12.2. Import</h3>

+<h3 id="_import">14.2. Import</h3>

 <div class="ulist"><ul>

 <li>

 <p>

 <a href="#S_ImportDiveComputer"><em>Import from dive computer</em></a> - Import dive information

-from a dive computer.

+  from a dive computer.

 </p>

 </li>

 <li>

 <p>

 <a href="#Unified_import"><em>Import Log Files</em></a> - Import dive information from a file in

-in a <em>Subsurface</em>-compatible format.

+  in a <em>Subsurface</em>-compatible format.

 </p>

 </li>

 <li>

 <p>

-<a href="#S_Companion"><em>Import GPS data from Subsurface Service</em></a> - Load GPS

-coordinates from the <em>Subsurface</em> mobile phone app.

+<a href="#S_Companion"><em>Import GPS data from Subsurface web service</em></a> - Load GPS

+  coordinates from the <em>Subsurface</em> mobile phone app.

 </p>

 </li>

 <li>

 <p>

 <a href="#S_ImportingDivelogsDe"><em>Import from Divelogs.de</em></a> - Import dive information

-from <em>www.Divelogs.de</em>.

+  from <em>www.Divelogs.de</em>.

 </p>

 </li>

 </ul></div>

 </div>

 <div class="sect2">

-<h3 id="_log">12.3. Log</h3>

+<h3 id="_log">14.3. Log</h3>

 <div class="ulist"><ul>

 <li>

 <p>

@@ -3873,19 +4408,19 @@ from <em>www.Divelogs.de</em>.
 <li>

 <p>

 <em>Paste dive components</em> - Paste, into the selected dives in the <strong>Dive List</strong>,

-   the information copied using the <em>Copy dive components</em> option.

+  the information copied using the <em>Copy dive components</em> option.

 </p>

 </li>

 <li>

 <p>

 <a href="#S_Renumber"><em>Renumber</em></a> - Renumber the dives listed in the <strong>Dive List</strong>

-panel.

+  panel.

 </p>

 </li>

 <li>

 <p>

 <a href="#S_Group"><em>Auto Group</em></a> - Group the dives in the <strong>Dive List</strong> panel into dive

-trips.

+  trips.

 </p>

 </li>

 <li>

@@ -3893,15 +4428,20 @@ trips.
 <a href="#S_DeviceNames"><em>Edit Device Names</em></a> - Edit the names of dive computers to facilitate your logs.

 </p>

 </li>

+<li>

+<p>

+<a href="#S_Filter"><em>Filter divelist</em></a> - Select only some dives, based on specific tags or dive criteria.

+</p>

+</li>

 </ul></div>

 </div>

 <div class="sect2">

-<h3 id="_view">12.4. View</h3>

+<h3 id="_view">14.4. View</h3>

 <div class="ulist"><ul>

 <li>

 <p>

 <a href="#S_ViewPanels"><em>All</em></a> - View the four main <em>Subsurface</em> panels

-simmultaneously.

+  simmultaneously.

 </p>

 </li>

 <li>

@@ -3927,17 +4467,17 @@ simmultaneously.
 <li>

 <p>

 <em>Yearly Statistics</em> - Display summary statistics about dives during this and past

-years.

+  years.

 </p>

 </li>

 <li>

 <p>

-<em>Prev DC</em> - Switch to next dive computer.

+<em>Prev DC</em> - Switch to previous dive computer.

 </p>

 </li>

 <li>

 <p>

-<em>Next DC</em> - Switch to previous dive computer.

+<em>Next DC</em> - Switch to next dive computer.

 </p>

 </li>

 <li>

@@ -3948,33 +4488,28 @@ years.
 </ul></div>

 </div>

 <div class="sect2">

-<h3 id="_filter">12.5. Filter</h3>

+<h3 id="_help">14.5. Help</h3>

 <div class="ulist"><ul>

 <li>

 <p>

-<em>Select Events</em> - This option is not implemented yet.

+<em>About Subsurface</em> - Show a panel with the version number of <em>Subsurface</em> as

+  well as licensing information.

 </p>

 </li>

-</ul></div>

-</div>

-<div class="sect2">

-<h3 id="_help">12.6. Help</h3>

-<div class="ulist"><ul>

 <li>

 <p>

-<em>About Subsurface</em> - Show a panel with the version number of <em>Subsurface</em> as

-well as licensing information.

+<em>Check for updates</em> - Find out whether a newer version of Subsurface is available

+  on the <a href="http://subsurface-divelog.org/"><em>Subsurface</em> web site</a>.

 </p>

 </li>

 <li>

 <p>

-<em>Check for updates</em> - Find out whether a newer version of Subsurface is available

-on the <a href="http://subsurface-divelog.org/"><em>Subsurface</em> web site</a>.

+<a href="#S_UserSurvey"><em>User survey</em></a>  - Help to make <em>Subsurface</em> even better by taking part in our user survey.

 </p>

 </li>

 <li>

 <p>

-<em>User Manual</em> - Open a window showing this user manual.

+<em>User manual</em> - Open a window showing this user manual.

 </p>

 </li>

 </ul></div>

@@ -3982,10 +4517,10 @@ on the <a href="http://subsurface-divelog.org/"><em>Subsurface</em> web site</a>
 </div>

 </div>

 <div class="sect1">

-<h2 id="_appendix_a_operating_system_specific_information_for_importing_dive_information_from_a_dive_computer">13. APPENDIX A: Operating system specific information for importing dive information from a dive computer.</h2>

+<h2 id="_appendix_a_operating_system_specific_information_for_importing_dive_information_from_a_dive_computer">15. APPENDIX A: Operating system specific information for importing dive information from a dive computer.</h2>

 <div class="sectionbody">

 <div class="sect2">

-<h3 id="_make_sure_that_the_os_has_the_required_drivers_installed">13.1. Make sure that the OS has the required drivers installed</h3>

+<h3 id="_make_sure_that_the_os_has_the_required_drivers_installed">15.1. Make sure that the OS has the required drivers installed</h3>

 <div class="admonitionblock">

 <table><tr>

 <td class="icon">

@@ -4026,7 +4561,7 @@ On a Mac users sometimes have to manually hunt for the correct
 </ul></div>

 </div>

 <div class="sect2">

-<h3 id="S_HowFindDeviceName">13.2. How to Find the Device Name for USB devices and set its write permission</h3>

+<h3 id="S_HowFindDeviceName">15.2. How to Find the Device Name for USB devices and set its write permission</h3>

 <div class="admonitionblock">

 <table><tr>

 <td class="icon">

@@ -4117,6 +4652,12 @@ be listed
 among the different IDs.

 </p>

 </li>

+<li>

+<p>

+Under some circumstances this change takes only effect (eg. on Ubuntu) after

+one logs out and then logs in again.

+</p>

+</li>

 </ul></div>

 <div class="paragraph"><p>With the appropriate device name (e.g. <code>dev/ttyUSB3</code>) and with write permission

 to the USB

@@ -4124,7 +4665,7 @@ 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">13.3. Setting up bluetooth enabled devices</h3>

+<h3 id="S_HowFindBluetoothDeviceName">15.3. Setting up bluetooth enabled devices</h3>

 <div class="admonitionblock">

 <table><tr>

 <td class="icon">

@@ -4145,7 +4686,7 @@ different procedure to get the devices name to communicate with
 </ul></div>

 <div class="paragraph"><p>For Bluetooth pairing of the dive computer, refer to the

 manufacturer&#8217;s user guide. When using a Shearwater Predator/Petrel, select

-<em>Dive Log &#8594; Upload Log</em> and wait for the <em>Wait PC</em> message.</p></div>

+<em>Dive Log &#8594;  Upload Log</em> and wait for the <em>Wait PC</em> message.</p></div>

 <div class="ulist"><ul>

 <li>

 <p>

@@ -4154,9 +4695,9 @@ manufacturer&#8217;s user guide. When using a Shearwater Predator/Petrel, select
 </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

-<em>Control Panel&#8594;Bluetooth Devices&#8594;Add Wireless Device</em>.

+<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>Properties&#8594;COM

+allowing pairing. Right click on it and choose <em>Propertie s&#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

@@ -4187,23 +4728,23 @@ enable it, in case of <code>initd</code>, run something like <code>rc.config sta
 <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.

+   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.

 </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

+   client devices, look for the dive computer and remember the MAC

+   address are shown there

 </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>

+   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>

 </p>

 </li>

 </ul></div>

@@ -4213,10 +4754,10 @@ manually by running:</p></div>
 <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.

+   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.

 </p>

 </li>

 </ul></div>

@@ -4226,10 +4767,10 @@ address in the last step above, e.g. <em>/dev/rfcomm0</em>.</p></div>
 </div>

 </div>

 <div class="sect1">

-<h2 id="_appendix_b_dive_computer_specific_information_for_importing_dive_information">14. APPENDIX B: Dive Computer specific information for importing dive information.</h2>

+<h2 id="_appendix_b_dive_computer_specific_information_for_importing_dive_information">16. APPENDIX B: Dive Computer specific information for importing dive data.</h2>

 <div class="sectionbody">

 <div class="sect2">

-<h3 id="S_ImportUemis">14.1. Import from a Uemis Zurich</h3>

+<h3 id="S_ImportUemis">16.1. Importing from Uemis Zurich</h3>

 <div class="admonitionblock">

 <table><tr>

 <td class="icon">

@@ -4267,7 +4808,7 @@ may have to do this more than once, depending on how many dives are
 stored on the dive computer.</p></div>

 </div>

 <div class="sect2">

-<h3 id="S_ImportingGalileo">14.2. Importing dives from the Uwatec Galileo</h3>

+<h3 id="S_ImportingGalileo">16.2. Importing from Uwatec Galileo</h3>

 <div class="admonitionblock">

 <table><tr>

 <td class="icon">

@@ -4297,7 +4838,7 @@ available from some Internet web sites e.g.
 available for OSX 10.6 or higher.</p></div>

 </div>

 <div class="sect2">

-<h3 id="S_ImportingDR5">14.3. Importing dives from Heinrichs Weikamp DR5</h3>

+<h3 id="S_ImportingDR5">16.3. Importing from Heinrichs Weikamp DR5</h3>

 <div class="admonitionblock">

 <table><tr>

 <td class="icon">

@@ -4315,7 +4856,24 @@ factors in the <em>Graph Settings</em> in <em>Subsurface</em> to generate a deco
 </div>

 </div>

 <div class="sect2">

-<h3 id="_import_from_shearwater_predator_using_bluetooth">14.4. Import from Shearwater Predator using Bluetooth</h3>

+<h3 id="S_ImportingXDeep">16.4. Importing from xDEEP BLACK</h3>

+<div class="admonitionblock">

+<table><tr>

+<td class="icon">

+<img src="images/icons/HW_xdeepblack.jpg" alt="Note" />

+</td>

+<td class="content">Each dive has to be individually saved as UDDF file using "Export UDDF" option in BLACK&#8217;s logbook menu.

+When mounted as a USB drive UDDF files are available in LOGBOOK directory.

+Note: The xDEEP BLACK saves NDL time but does not seem to store gradient factors nor deco information, so

+for <em>Subsurface</em> it is not possible to display them. Adjust the gradient

+factors in the <em>Graph Settings</em> in <em>Subsurface</em> to generate a deco overlay in the

+<em>Subsurface</em> <strong>Dive Profile</strong> panel but please note that the deco calculated by

+<em>Subsurface</em> will most likely differ from the one displayed on the xDEEP BLACK.</td>

+</tr></table>

+</div>

+</div>

+<div class="sect2">

+<h3 id="_importing_from_shearwater_predator_using_bluetooth">16.5. Importing from Shearwater Predator using Bluetooth</h3>

 <div class="admonitionblock">

 <table><tr>

 <td class="icon">

@@ -4349,7 +4907,7 @@ switch off WiFi while using Bluetooth
 </ul></div>

 </div>

 <div class="sect2">

-<h3 id="S_PoseidonMkVI">14.5. Importing dive logs from the Poseidon MkVI Discovery</h3>

+<h3 id="S_PoseidonMkVI">16.6. Importing from Poseidon MkVI Discovery</h3>

 <div class="admonitionblock">

 <table><tr>

 <td class="icon">

@@ -4367,7 +4925,7 @@ can be downloaded at a time, comprising three files:</td>
 <li>

 <p>

 Setup configuration for the dive and key dive parameters (file with a .txt

-extension)

+  extension)

 </p>

 </li>

 <li>

@@ -4378,14 +4936,14 @@ Dive log details (file with a .csv extension)
 <li>

 <p>

 Redbook format dive log (file with .cvsr extension). This is a compressed

-version of the dive log using a propriatary format.

+  version of the dive log using a proprietary format.

 </p>

 </li>

 </ul></div>

 <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_dive_logs_from_the_apd_inspiration_ccr">14.6. Importing dive logs from the APD Inspiration CCR</h3>

+<h3 id="_importing_from_apd_inspiration_ccr">16.7. Importing from APD Inspiration CCR</h3>

 <div class="admonitionblock">

 <table><tr>

 <td class="icon">

@@ -4423,12 +4981,12 @@ Open a text editor, e.g. Notepad (Windows), TextWrangler (Mac).
 <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 .CSV

 </p>

 </li>

 <li>

 <p>

-Within <em>Subsurface</em>, select <em>Import&#8594;Import log files</em> to open the <a href="#Unified_import">universal import dialogue</a>.

+Within <em>Subsurface</em>, select <em>Import &#8594;  Import log files</em> to open the <a href="#Unified_import">universal import dialogue</a>.

 </p>

 </li>

 <li>

@@ -4439,13 +4997,13 @@ In the dropdown list towards the bottom right of the dialogue, select "<em>CSV f
 <li>

 <p>

 On the list of file names select the .CSV file that has been created above. An import

-dialogue opens.

+  dialogue opens.

 </p>

 </li>

 <li>

 <p>

 In the dropdown list on the middle right labeled '<em>Pre-configured imports</em>",

-select <em>APD Log Viewer</em>.

+  select <em>APD Log Viewer</em>.

 </p>

 </li>

 <li>

@@ -4459,7 +5017,7 @@ Ensure the other settings for the ADP dive log are appropriate, then select <em>
 </div>

 </div>

 <div class="sect1">

-<h2 id="_appendix_c_exporting_dive_log_information_from_external_dive_log_software">15. APPENDIX C: Exporting Dive log information from external dive log software.</h2>

+<h2 id="_appendix_c_exporting_dive_log_information_from_external_dive_log_software">17. APPENDIX C: Exporting Dive log information from external dive log software.</h2>

 <div class="sectionbody">

 <div class="paragraph"><p>The import of dive log data from external dive log software is mostly performed

 using

@@ -4472,7 +5030,7 @@ However, in some cases, a two-step process may be required:</p></div>
 <li>

 <p>

 Export the foreign dive log data to format that is accessible from

-<em>Subsurface</em>.

+  <em>Subsurface</em>.

 </p>

 </li>

 <li>

@@ -4485,15 +5043,16 @@ Import the accessible dive log data into <em>Subsurface</em>.
 data from foreign

 dive log software. The procedures below mostly apply to Linux and/or Windows.</p></div>

 <div class="sect2">

-<h3 id="S_ImportingDivesSuunto">15.1. Exporting dives from <strong>Suunto Divemanager (DM3 and DM4)</strong></h3>

+<h3 id="S_ImportingDivesSuunto">17.1. Exporting from <strong>Suunto Divemanager (DM3, DM4 or DM5)</strong></h3>

 <div class="admonitionblock">

 <table><tr>

 <td class="icon">

 <img src="images/icons/suuntologo.jpg" alt="Note" />

 </td>

-<td class="content">Divemanager 3 (DM3) is an older version of the Suunto software. More recent

-Suunto dive computers use Divemanager 4 (DM4). The

-two versions of Divemanager use different methods and different file naming

+<td class="content">DiveManager is a MS Windows application for Suunto dive computers.

+Divemanager 3 (DM3) is an older version of the Suunto software. More recent

+Suunto dive computers use Divemanager version 4 or 5 (DM4 or DM5). The

+different versions of Divemanager use different methods and different file naming

 conventions to export dive log data.</td>

 </tr></table>

 </div>

@@ -4512,7 +5071,7 @@ Do not start the import wizard to import dives from the dive computer.
 <li>

 <p>

 In the navigation tree on the left side of the program-window, select the appropriate

-dives.

+   dives.

 </p>

 </li>

 <li>

@@ -4528,15 +5087,14 @@ To select certain dives: hold <em>ctrl</em> and click the dive
 <li>

 <p>

 To select all dives:  Select the first dive, hold down shift and

-select the

-last dive

+          select the last dive

 </p>

 </li>

 </ul></div>

 </li>

 <li>

 <p>

-With the dives marked, use the program menu <em>File &#8594; Export</em>

+With the dives marked, use the program menu <em>File &#8594;  Export</em>

 </p>

 </li>

 <li>

@@ -4557,7 +5115,7 @@ A file-manager like window pops up
 <li>

 <p>

 Navigate to the directory for storing the

-Divelog.SDE file

+   Divelog.SDE file

 </p>

 </li>

 <li>

@@ -4585,20 +5143,21 @@ The dives are now exported to the file Divelog.SDE.
 </p>

 </li>

 </ol></div>

-<div class="paragraph"><p><strong>Divemanager 4 (DM4):</strong></p></div>

-<div class="paragraph"><p>To export divelog from <em>Suunto DM4</em>, one needs to locate the DM4 database

+<div class="paragraph"><p><strong>Divemanager 4 (DM4) and Divemanager 5 (DM5):</strong></p></div>

+<div class="paragraph"><p>DM4 and DM5 use identical mechanisms for exporting dive logs.

+To export a divelog from Divemanager one needs to locate the DM4/DM5 database

 where the dives are stored. the user can either look for the original

 database or make a backup of the dives. Both methods are described here.</p></div>

-<div class="paragraph"><p>Locating the Suunto DM4 database:</p></div>

+<div class="paragraph"><p>Locating the Suunto DM4 (or DM5) database:</p></div>

 <div class="olist arabic"><ol class="arabic">

 <li>

 <p>

-Start Suunto DM4

+Start Suunto DM4/DM5

 </p>

 </li>

 <li>

 <p>

-Select <em>Help &#8594; About</em>

+Select <em>Help &#8594;  About</em>

 </p>

 </li>

 <li>

@@ -4618,15 +5177,15 @@ Paste the address to the path box at the top of the File Explorer
 </li>

 <li>

 <p>

-The database is called DM4.db

+The database is called DM4.db or DM5.db

 </p>

 </li>

 </ol></div>

-<div class="paragraph"><p>Backing up Suunto DM4:</p></div>

+<div class="paragraph"><p>Making a backup copy of the Suunto DM4/DM5 database:</p></div>

 <div class="olist arabic"><ol class="arabic">

 <li>

 <p>

-Start Suunto DM4

+Start Suunto DM4/DM5

 </p>

 </li>

 <li>

@@ -4637,7 +5196,7 @@ Select <em>File - Create backup</em>
 <li>

 <p>

 From the file menu select the location and name for the backup, we&#8217;ll

-   use DM4 in here with the default extension .bak

+   use DM4 (or DM5) in here with the default extension .bak

 </p>

 </li>

 <li>

@@ -4647,13 +5206,28 @@ Click <em>Save</em>
 </li>

 <li>

 <p>

-The dives are now exported to the file DM4.bak

+The dives are now exported to the file DM4.bak (or DM5.bak)

 </p>

 </li>

 </ol></div>

 </div>

 <div class="sect2">

-<h3 id="_exporting_from_mares_dive_organiser_v2_1">15.2. Exporting from Mares Dive Organiser V2.1</h3>

+<h3 id="_exporting_from_atomic_logbook">17.2. Exporting from Atomic Logbook</h3>

+<div class="admonitionblock" id="Atomic_Export">

+<table><tr>

+<td class="icon">

+<img src="./images/icons/note.png" 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.

+The divelog is kept in a SQlite database at

+C:\ProgramData\AtomicsAquatics\Cobalt-Logbook\Cobalt.db. This file can

+be directly imported to Subsurface.</td>

+</tr></table>

+</div>

+</div>

+<div class="sect2">

+<h3 id="_exporting_from_mares_dive_organiser_v2_1">17.3. Exporting from Mares Dive Organiser V2.1</h3>

 <div class="admonitionblock" id="Mares_Export">

 <table><tr>

 <td class="icon">

@@ -4671,16 +5245,16 @@ which can be imported into <em>Subsurface</em>.</td>
 <li>

 <p>

 Within Dive Organiser, select

-<em>Database &#8594; Backup</em> from the main menu and back up the database to the desk

-top.

-This creates a zipped file DiveOrganiserxxxxx.dbf.

+   <em>Database &#8594;  Backup</em> from the main menu and back up the database to the desk

+   top.

+   This creates a zipped file DiveOrganiserxxxxx.dbf.

 </p>

 </li>

 <li>

 <p>

 Rename the file to

-DiveOrganiserxxxxx.zip. Inside the zipped directory is a file

-<em>DiveOrganiser.sdf</em>.

+   DiveOrganiserxxxxx.zip. Inside the zipped directory is a file

+   <em>DiveOrganiser.sdf</em>.

 </p>

 </li>

 <li>

@@ -4696,7 +5270,7 @@ The password for accessing the .zip file is <em>mares</em>.
 </ol></div>

 </div>

 <div class="sect2">

-<h3 id="S_ImportingDivinglog">15.3. Exporting dives from <strong>DivingLog 5.0</strong></h3>

+<h3 id="S_ImportingDivingLog">17.4. Exporting from <strong>DivingLog 5.0</strong></h3>

 <div class="admonitionblock">

 <table><tr>

 <td class="icon">

@@ -4707,14 +5281,14 @@ 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>

+selecting <em>File &#8594;  Preferences &#8594; Units and Language</em> by clicking the <em>Metric</em>

 button). Then do the following:</td>

 </tr></table>

 </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;  XML</em> menu

 </p>

 </li>

 <li>

@@ -4732,10 +5306,143 @@ Click on the export button and select the filename
 </div>

 </div>

 <div class="sect1">

-<h2 id="_appendix_d_faqs">16. APPENDIX D: FAQs.</h2>

+<h2 id="S_Appendix_D">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

+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

+to a .CSV file that will later be imported from <em>Subsurface</em>.

+Creating a .CSV is a straightforward task, although the procedure is somewhat different

+according to which spreadsheet program is used.</p></div>

+<div class="paragraph"><p>The first step is to organize the diving data in the spreadsheet, so that the first row

+contains the names (or titles) of each column and the information for each dive is stored in a single row.

+<em>Subsurface</em> supports many data items (Dive #, Date,

+Time, Duration, Location, GPS, Max Depth, Mean Depth, Buddy, Notes, Weight and Tags).

+The user can organize dive data following a few simple rules:</p></div>

+<div class="olist arabic"><ol class="arabic">

+<li>

+<p>

+Date: use one of the following formats: yyyy-mm-dd, dd.mm.yyyy, mm/dd/yyyy

+</p>

+</li>

+<li>

+<p>

+Duration: the format should be minutes:seconds.

+</p>

+</li>

+<li>

+<p>

+Unit system: only one unit system shold be used (i.e., no mixture between imperial and metric units)

+</p>

+</li>

+<li>

+<p>

+Tags and buddies: values should be separated using a comma.

+</p>

+</li>

+<li>

+<p>

+GPS position: users must use decimal degrees, e.g. 30.22496 30.821798

+</p>

+</li>

+</ol></div>

+<div class="sect2">

+<h3 id="_em_libreoffice_calc_em_and_em_openoffice_calc_em">18.1. <em>LibreOffice Calc</em> and <em>OpenOffice Calc</em></h3>

+<div class="paragraph"><p>These are open source spreadsheet applications forming parts of larger open source office suite applications. The user interaction with <em>LibreOffice</em> and <em>OpenOffice</em> is very similar.

+In Libreoffice Calc the time format should be set to minutes:seconds - [mm]:ss and dates should be set to one of: yyyy-mm-dd, dd.mm.yyyy, mm/dd/yyyy. A typical dive log may look like this:</p></div>

+<div class="imageblock" style="text-align:center;">

+<div class="content">

+<img src="images/LOffice_spreadsheetdata.jpg" alt="FIGURE: Spreadsheet data" />

+</div>

+</div>

+<div class="paragraph"><p>To export the data as a .CSV file from within LibreOffice click <em>File &#8594;  Save As</em>. On the dialogue that comes up, select the <em>Text CSV (.csv)</em> as the file type and select the option <em>Edit filter settings</em>.</p></div>

+<div class="imageblock" style="text-align:center;">

+<div class="content">

+<img src="images/LOffice_save_as_options.jpg" alt="FIGURE: Save as options" />

+</div>

+</div>

+<div class="paragraph"><p>After selecting <em>Save</em>, select the appropriate field delimiter (choose <em>Tab</em> to prevent conflicts with the comma when using this as a decimal point), then select <em>OK</em>.</p></div>

+<div class="imageblock" style="text-align:center;">

+<div class="content">

+<img src="images/LOffice_field_options.jpg" alt="FIGURE: Field options" />

+</div>

+</div>

+<div class="paragraph"><p>One can double check the .CSV file by opening it with a text editor, and then import the dive data as explained on the section <a href="#S_ImportingCSVDives">Importing CSV dives</a>.</p></div>

+</div>

+<div class="sect2">

+<h3 id="_microsoft_em_excel_em">18.2. Microsoft <em>Excel</em></h3>

+<div class="paragraph"><p>The field delimiter (called "<em>list separator</em>" in Microsoft manuals) is not accessible

+from within <em>Excel</em> and needs to be set through the <em>Microsoft Control Panel</em>. After changing the

+separator character, all software on the Windows machine use the new character as a separator.

+One can change the character back to the default character by following the same procedure, outlined below.</p></div>

+<div class="ulist"><ul>

+<li>

+<p>

+In Microsoft Windows, click the <strong>Start</strong> button, and then select <em>Control Panel</em> from the list on the right-hand side.

+</p>

+</li>

+<li>

+<p>

+Open the <em>Regional and Language Options</em> dialog box.

+</p>

+</li>

+<li>

+<p>

+Do one of the following:

+</p>

+<div class="ulist"><ul>

+<li>

+<p>

+In Windows 7, click the <em>Formats</em> tab, and then click <em>Customize this format</em>.

+</p>

+</li>

+<li>

+<p>

+In Windows XP, click the <em>Regional Options</em> tab, and then click <em>Customize</em>.

+</p>

+</li>

+</ul></div>

+</li>

+<li>

+<p>

+Type a new separator in the <em>List separator</em> box. To use a TAB-delimited file, type the word TAB in the box.

+</p>

+</li>

+<li>

+<p>

+Click <em>OK</em> twice.

+</p>

+</li>

+</ul></div>

+<div class="paragraph"><p>Below is an image of the <em>Control Panel</em>:</p></div>

+<div class="imageblock" style="text-align:center;">

+<div class="content">

+<img src="images/Win_SaveCSV2.jpg" alt="FIGURE: Win List separator" />

+</div>

+</div>

+<div class="paragraph"><p>To export the dive log in CSV format:</p></div>

+<div class="paragraph"><p>With the dive log opened in <em>Excel</em>, select the round Windows button at the top left, then <em>Save As</em>.</p></div>

+<div class="imageblock" style="text-align:center;">

+<div class="content">

+<img src="images/Win_SaveCSV1.jpg" alt="FIGURE: Excel save as option" />

+</div>

+</div>

+<div class="paragraph"><p>Click on the left-hand part of the <em>Save as</em> option, NOT on the arrow on the right-hand. This brings up a dialogue for saving the spreadsheet in an alternative format. From the dropdown list at the bottom of the dialogue, marked <em>Save as Type:</em>, select <em>CSV(Comma delimited) (*.CSV)</em>. Ensure that the appropriate folder has been selected to save the CSV file into.</p></div>

+<div class="imageblock" style="text-align:center;">

+<div class="content">

+<img src="images/Win_SaveCSV3.jpg" alt="FIGURE: Excel save CSV dialogue" />

+</div>

+</div>

+<div class="paragraph"><p>Select the <em>Save</em> button. The CSV-formatted file is saved into the folder that was selected. One can double check the .CSV file by opening it with a text editor, and then import the dive data as explained on the section <a href="#S_ImportingCSVDives">Importing CSV dives</a>.</p></div>

+</div>

+</div>

+</div>

+<div class="sect1">

+<h2 id="_appendix_e_faqs">19. APPENDIX E: FAQs.</h2>

 <div class="sectionbody">

 <div class="sect2">

-<h3 id="_subsurface_appears_to_miscalculate_gas_consumption_and_sac">16.1. Subsurface appears to miscalculate gas consumption and SAC</h3>

+<h3 id="_subsurface_appears_to_miscalculate_gas_consumption_and_sac">19.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

@@ -4766,7 +5473,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">16.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">19.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")

@@ -4775,7 +5482,7 @@ that your dive is 50 minutes long - because you have fifty minutes worth of samp
 subsurface will say it&#8217;s 45 minutes - because you were actually diving for 45 minutes.

 It&#8217;s even more noticeable if you do things like divemastering the initial OW dives, when

 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>

+you don&#8217;t want that to count as some kind of long dive”.</p></div>

 </div>

 </div>

 </div>

@@ -4783,7 +5490,7 @@ you may stay in the water for a long time, but spend most of it at the surface.
 <div id="footnotes"><hr /></div>

 <div id="footer">

 <div id="footer-text">

-Last updated 2014-11-18 13:04:00 GMT

+Last updated 2015-02-04 07:44:40 PST

 </div>

 </div>

 </body>