diff --git a/Documentation/user-manual.html.git b/Documentation/user-manual.html.git
index bae97b6af..b27b7ebbd 100644
--- a/Documentation/user-manual.html.git
+++ b/Documentation/user-manual.html.git
@@ -3,7 +3,7 @@
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">
 <head>
 <meta http-equiv="Content-Type" content="application/xhtml+xml; charset=UTF-8" />
-<meta name="generator" content="AsciiDoc 8.6.8" />
+<meta name="generator" content="AsciiDoc 8.6.9" />
 <title></title>
 <style type="text/css">
 /*
@@ -410,7 +410,7 @@ asciidoc.install(3);
 <div class="paragraph"><p><span class="big">USER MANUAL</span></p></div>
 <div class="paragraph"><p><strong>Manual authors</strong>: Willem Ferguson, Jacco van Koll, Dirk Hohndel, Reinout Hoornweg,
 Linus Torvalds, Miika Turkia, Amit Chaudhuri, Jan Schubert, Salvador Cuñat, Pedro Neves</p></div>
-<div class="paragraph"><p><span class="blue"><em>Version 4.4,  February 2015</em></span></p></div>
+<div class="paragraph"><p><span class="blue"><em>Version 4.5, October 2015</em></span></p></div>
 <div class="paragraph"><p>Welcome as a user of <em>Subsurface</em>, an advanced dive logging program with
 extensive infrastructure to describe, organise, interpret and print scuba
 and free dives. <em>Subsurface</em> offers many advantages over other similar
@@ -452,6 +452,12 @@ Do you need an intuitive graphical dive planner that integrates with and takes
    into account the dives that have already been logged?
 </p>
 </li>
+<li>
+<p>
+Do you need a way of storing or backing up your dive log on the Internet, allowing
+   you to view your dive log from anywhere, using an Internet browser?
+</p>
+</li>
 </ul></div>
 <div class="paragraph"><p><em>Subsurface</em> binaries are available for Windows PCs (Win XP or later), Intel
 based Macs (OS/X) and many Linux distributions. <em>Subsurface</em> can be built for
@@ -500,7 +506,7 @@ command line.</p></div>
 <h2 id="S_StartUsing">3. Start Using the Program</h2>
 <div class="sectionbody">
 <div class="paragraph"><p>The <em>Subsurface</em> window is usually divided into four panels with a <strong>Main
-Menu</strong> (File Import Log View Filter Help) at the top of the window (for Windows
+Menu</strong> (File Import Log View Help) at the top of the window (for Windows
 and Linux) or the top of the screen (for Mac and Ubuntu Unity). The four panels are:</p></div>
 <div class="olist arabic"><ol class="arabic">
 <li>
@@ -521,7 +527,7 @@ and centred on the site of the last dive selected in the <strong>Dive List</stro
 </li>
 <li>
 <p>
-The <strong>Dive Info</strong> to the top left, giving more detailed information on the
+The <strong>Info</strong> to the top left, giving more detailed information on the
 dive selected in the <strong>Dive List</strong>, including some statistics for the selected dive or for all
 highlighted dive(s).
 </p>
@@ -537,16 +543,16 @@ selected dive in the <strong>Dive List</strong>.
 the panels. <em>Subsurface</em> remembers the position of the dividers, so the next
 time <em>Subsurface</em> starts it uses the positions of the dividers from when the program
 was last used.</p></div>
-<div class="paragraph"><p>If a dive is selected in the <strong>Dive List</strong>, the dive location, detailed information
+<div class="paragraph"><p>If a single dive is selected in the <strong>Dive List</strong>, the dive location, detailed information
 and profile of
 the <em>selected dive</em> are shown in the respective panels. On the other hand, if
-one highlights more than one dive the last highlighted dive is the <em>selected
+several dives are selected, the last highlighted dive is the <em>selected
 dive</em>, but summary data of all <em>highlighted dives</em> are shown in the <strong>Stats</strong> tab
-of the <strong>Dive Info</strong> panel (maximum, minimum and average depths, durations, water
+of the <strong>Info</strong> panel (maximum, minimum and average depths, durations, water
 temperatures and SAC; total time and number of dives selected).</p></div>
 <div class="imageblock" id="S_ViewPanels" style="text-align:center;">
 <div class="content">
-<img src="images/main_window_f20.jpg" alt="The Main Window" />
+<img src="images/main_window_f22.jpg" alt="The Main Window" />
 </div>
 </div>
 <div class="paragraph"><p>The user can determine which of the four panels are displayed by selecting the
@@ -555,7 +561,7 @@ display:</p></div>
 <div class="paragraph"><p><strong>All</strong>: show all four of the panels as in the screenshot above.</p></div>
 <div class="paragraph"><p><strong>Divelist</strong>: Show only the Dive List.</p></div>
 <div class="paragraph"><p><strong>Profile</strong>: Show only the Dive Profile of the selected dive.</p></div>
-<div class="paragraph"><p><strong>Info</strong>: Show only the Dive Notes about the last selected dive and statistics for
+<div class="paragraph"><p><strong>Info</strong>: Show only the Notes about the last selected dive and statistics for
 all highlighted dives.</p></div>
 <div class="paragraph"><p><strong>Globe</strong>: Show only the world map, centred on the last selected dive.</p></div>
 <div class="paragraph"><p>Like many other functions that can be accessed via the Main Menu, these options
@@ -608,7 +614,7 @@ Import dive log information that has been maintained either as a spreadsheet
 <div class="ulist"><ul>
 <li>
 <p>
-The divecomputer itself. See: <a href="#S_ImportDiveComputer">Importing new dive information from a Dive Computer</a> or
+The dive computer itself. See: <a href="#S_ImportDiveComputer">Importing new dive information from a Dive Computer</a> or
 </p>
 </li>
 <li>
@@ -633,230 +639,31 @@ depth, the names of your dive buddy and of the dive master or dive guide, and
 some remarks about the dive. <em>Subsurface</em> can store much more information
 than this for each dive. In order to add a dive to a dive log, select <em>Log
 &#8594;  Add Dive</em> from the Main Menu. The program then shows three panels to enter
-information for a dive: two tabs in the <strong>Dive Info</strong> panel (<strong>Dive Notes</strong> and
+information for a dive: two tabs in the <strong>Info</strong> panel (<strong>Notes</strong> and
 <strong>Equipment</strong>), as well as the <strong>Dive Profile</strong> panel that displays a graphical profile
 of each dive. These panels are respectively marked <span class="red">A</span>, <span class="red">B</span> and
 <span class="red">C</span>
 in the figure below. Each of these tabs will now be explained for data entry.</p></div>
 <div class="imageblock" style="text-align:center;">
 <div class="content">
-<img src="images/AddDive1_f20.jpg" alt="FIGURE: Add dive" />
+<img src="images/AddDive1_f22.jpg" alt="FIGURE: Add dive" />
 </div>
 </div>
-<div class="paragraph"><p>When one edits a field in Dive notes or Equipment panels, <em>Subsurface</em> enters <strong>Editing Mode</strong>,
-indicated by the message in the blue box at the top of the <em>Dive Notes</em> panel (see the image below). This message is
-displayed in all the panels under Dive notes and Equipment when in <strong>Editing Mode</strong>.</p></div>
+<div class="paragraph"><p>When one edits a field in Notes or Equipment panels, <em>Subsurface</em> enters <strong>Editing Mode</strong>,
+indicated by the message in the blue box at the top of the <strong>Notes</strong> panel (see the image below). This message is
+displayed in all the panels under Notes and Equipment when in <strong>Editing Mode</strong>.</p></div>
 <div class="imageblock" style="text-align:center;">
 <div class="content">
-<img src="images/BlueEditBar_f20.jpg" alt="Blue edit bar" />
+<img src="images/BlueEditBar_f22.jpg" alt="Blue edit bar" />
 </div>
 </div>
-<div class="paragraph"><p>The <em>Save</em> button should only be selected after all the parts of a dive have been entered.
+<div class="paragraph"><p>The <em>Apply changes</em> button should only be selected after all the parts of a dive have been entered.
 When entering dives by hand, the <em>Info</em>, <em>Equipment</em> and <em>Profile</em> tabs should be completed
-before saving the information. By selecting the <em>Save</em> button, a local copy of the information
+before saving the information. By selecting the <em>Apply changes</em> button, a local copy of the information
 for this specific dive is saved in memory. When one closes Subsurface, the program will
 ask again, this time whether the complete dive log should be saved on disk or not.</p></div>
 <div class="sect3">
-<h4 id="_dive_notes">5.1.1. Dive Notes</h4>
-<div class="paragraph"><p>This panel contains the date, time and place information for a particular dive,
-environmental conditions, co-divers and buddies, as well as some descriptive
-information. If one clicks on the <strong>Dive Notes</strong> tab, the following
-fields are visible:</p></div>
-<div class="imageblock" style="text-align:center;">
-<div class="content">
-<img src="images/AddDive2_f20.jpg" alt="FIGURE: The Dive Notes tab" />
-</div>
-</div>
-<div class="paragraph"><p>The <strong>Time</strong> field reflects the date and the time of the dive. By clicking
-the date, a calendar is displayed from which
-one can choose the correct date. Press ESC to escape from the calendar.
-The time values (hour and minutes) can also be
-edited directly by clicking on each of them in the text box and by overtyping the
-information displayed. The default date is the present date and the default time is
-an hour in advance of the present time.</p></div>
-<div class="paragraph"><p><strong>Air and water temperatures</strong>: the air and water temperatures during the
-dive can be typed directly on the fields to the right of the Start time.
-Temperature units are not needed, as they will be automatically supplied by
-<em>Subsurface</em>. Only the numerical value must be
-typed by the user (the units selected in the <em>Preferences</em>
-will determine whether metric or imperial units are used).</p></div>
-<div class="paragraph"><p><strong>Location</strong>: Here the name of the dive site can be entered, e.g. "Tihany, Lake
-Balaton,
-Hungary". Auto completion of location names will make this easier if one
-frequently dives at the same sites.</p></div>
-<div class="paragraph"><p><strong>Coordinates</strong>: The geographic coordinates of the dive site should be entered
-here. These can come from three sources:</p></div>
-<div class="olist loweralpha"><ol class="loweralpha">
-<li>
-<p>
-One can find the coordinates on the world map in the bottom right hand
-   part
-   of the Subsurface window. The map displays a green bar indicating "No location
-   data - Move the map and double-click to set the dive location". Upon a double-click
-   at the appropriate place, the green bar disappears and the coordinates are
-   stored.
-</p>
-</li>
-<li>
-<p>
-The coordinates can be obtained from the <em>Subsurface</em> Companion app if the
-   user has an Android or iPhone device with GPS and if the coordinates of the dive site
-   were stored using that device.
-   <a href="#S_Companion">Click here for more information</a>
-</p>
-</li>
-<li>
-<p>
-The coordinates can be entered by hand if they are known, using one of
-   four formats with latitude followed by longitude:
-</p>
-<div class="literalblock">
-<div class="content">
-<pre><code>ISO 6709 Annex D format e.g. 30°13'28.9"N 30°49'1.5"E
-Degrees and decimal minutes, e.g. N30° 13.49760' , E30° 49.30788'
-Degrees minutes seconds, e.g. N30° 13' 29.8" , E30° 49' 1.5"
-Decimal degrees, e.g. 30.22496 , 30.821798</code></pre>
-</div></div>
-</li>
-</ol></div>
-<div class="paragraph"><p>Southern hemisphere latitudes are given with a <strong>S</strong>, e.g. S30°, or with a
-negative value, e.g. -30.22496. Similarly western longitudes are given with a
-<strong>W</strong>, e.g. W07°, or with a negative value, e.g. -7.34323.</p></div>
-<div class="paragraph"><p>Some keyboards don&#8217;t have the degree sign (°). It can be replaced by a d like
-that: N30d W20d.</p></div>
-<div class="paragraph"><p>Please note that GPS coordinates of a dive site are linked to the Location
-name - so adding coordinates to dives that do not have a location description
-will cause unexpected behaviour (Subsurface will think that all of these
-dives have the same location and try to keep their GPS coordinates the
-same).</p></div>
-<div class="paragraph"><p><strong>Dive mode</strong>: This is a dropdown box allowing one to choose the type of dive
-performed. The options are OC (Open Circuit, the default setting, meant for most recreational dives),
-Freedive (dive without SCUBA equipment), CCR (Closed-circuit
-rebreather) and pSCR (Passive semi-closed rebreather).</p></div>
-<div class="paragraph"><p><strong>Divemaster</strong>: The name of the dive master or dive guide for this dive can be
-entered here.
-Again, this field offers auto completion based on the list of dive masters in
-the current logbook.</p></div>
-<div class="paragraph"><p><strong>Buddy</strong>: In this field one can enter the name(s) of the buddy / buddies
-(separated by commas) who accompanied the user on the dive. Auto completion
-is offered based on the list of buddies in the current logbook.</p></div>
-<div class="paragraph"><p><strong>Suit</strong>: The type of diving suit used for the dive can be entered here.
-As with the other items, auto completion of the suit description is available.
-Some dry-suit users may choose to use this field to record what combination of
-suit and thermal protection undersuit was used.</p></div>
-<div class="paragraph"><p><strong>Rating</strong>: One can provide a subjective overall rating of the dive on a
-5-point scale by clicking the appropriate star on the rating scale.</p></div>
-<div class="paragraph"><p><strong>Visibility</strong>: Similarly, one can provide a rating of visibility during the
-dive on a
-5-point scale by clicking the appropriate star.</p></div>
-<div class="paragraph"><p><strong>Tags</strong>: Tags that describe the type of dive performed may
-be entered here (separated by commas). Examples of common tags are boat, drift,
-training, cave etc. <em>Subsurface</em> has many built-in tags. Auto completion is once again offered.
-For instance, if <code>cav</code> was typed, then the tags <strong>cave</strong> and <strong>cavern</strong> are
-shown for the user to choose from.</p></div>
-<div class="paragraph"><p><strong>Notes</strong>: Any additional information can be typed here.</p></div>
-<div class="paragraph"><p>The <strong>Save</strong> and <strong>Cancel</strong> buttons are used to save all the information for tabs in
-the info panel and in the dive profile panel, so there&#8217;s no need to use them
-until ALL other information has been added. Here is an example of a completed
-Dive Notes panel:</p></div>
-<div class="imageblock" style="text-align:center;">
-<div class="content">
-<img src="images/CompletedDiveInfo_f20.jpg" alt="FIGURE: A completed Dive Notes tab" />
-</div>
-</div>
-</div>
-<div class="sect3">
-<h4 id="_equipment">5.1.2. Equipment</h4>
-<div class="paragraph"><p>The Equipment tab allows the user to enter information about the type of
-cylinder and gas used, as well as the weights used for a dive. This is a highly interactive part of
-<em>Subsurface</em> and the information on
-cylinders and gases (entered here) affects the behaviour of the dive profile
-(top right-hand panel).</p></div>
-<div class="paragraph" id="S_CylinderData"><p><strong>Cylinders</strong>: The cylinder information is entered through a dialogue that looks
-like this:</p></div>
-<div class="imageblock" style="text-align:center;">
-<div class="content">
-<img src="images/Gas_dialogue1_f20.jpg" alt="FIGURE:Initial cylinder dialogue" />
-</div>
-</div>
-<div class="paragraph"><p>The + button at the top right allows the user to add more cylinders for this
-dive.
-The dark dustbin icon on the left allows one to delete information for a
-particular cylinder. Note that it is not possible to delete a cylinder if it is used during the
-dive. One cylinder is implicitly used in the dive, even without a gas change event. Thus the first
-cylinder cannot be deleted until another cylinder is created.</p></div>
-<div class="paragraph"><p>Start by selecting a cylinder type on the left-hand side of the
-table.  To select a cylinder, click in the <strong>Type</strong> box.
-This brings up a button that can be used to display a dropdown list of
-cylinders:</p></div>
-<div class="imageblock" style="text-align:center;">
-<div class="content">
-<img src="images/Gas_dialogue2_f20.jpg" alt="FIGURE:The cylinder drop-down list button" />
-</div>
-</div>
-<div class="paragraph"><p>The drop-down list can be used to select the cylinder type used
-for the dive or the user may start typing in the box which shows the
-available options for the entered characters. The
-<strong>Size</strong> of the cylinder as well as its working pressure (<strong>WorkPress</strong>) will
-automatically be shown in the dialogue. If a cylinder is not shown in the dropdown list,
-type the name and description of that cylinder into the <strong>Type</strong> field.</p></div>
-<div class="paragraph"><p>Next, indicate the starting pressure and the ending pressure of
-the
-gas used during the dive. The unit of pressure (metric/imperial) corresponds
-to the setting in the <em>Preferences</em>.</p></div>
-<div class="paragraph"><p>Finally, type in the gas mixture used in the <strong>O2%</strong> field. If air
-was used, a value of 21% can be entered on this field,  or it might be
-left blank. If nitrox or trimix were used, their percentages of oxygen and/or
-helium must be specified.
-Any inappropriate fields should be left empty. After typing the information for
-the cylinder, press <em>ENTER</em> on the keyboard or click
-outside the cell that contains the cursor. Information for any additional
-cylinders can be added by using the + button at the top right hand. Following
-is an example of a complete description for a
-dive made using two cylinders (air and EAN50):</p></div>
-<div class="imageblock" style="text-align:center;">
-<div class="content">
-<img src="images/CylinderDataEntry3_f20.jpg" alt="FIGURE: a completed cylinder dive information table" />
-</div>
-</div>
-<div class="paragraph"><p><strong>Weights</strong>: Information about the weight system used during a dive can be entered
-using a dialogue very similar to that for the cylinder information. If the user
-clicks the + button on the top right of the weights dialogue, the table looks
-like this:</p></div>
-<div class="imageblock" style="text-align:center;">
-<div class="content">
-<img src="images/WeightsDataEntry1_f20.jpg" alt="FIGURE: The Weights dialogue" />
-</div>
-</div>
-<div class="paragraph"><p>If one then clicks on the <strong>Type</strong> field, a drop-down list becomes accessible
-through a down-arrow:</p></div>
-<div class="imageblock" style="text-align:center;">
-<div class="content">
-<img src="images/WeightsDataEntry2_f20.jpg" alt="FIGURE: Weights type drop-down list button" />
-</div>
-</div>
-<div class="paragraph"><p>The drop-down list can then be used to select the type of weight system or the user may start
-typing in the box which shows the available options for the entered characters. In
-the <strong>Weight</strong>
-field, the weight used during the dive must be typed. After typing the
-information
-for the weight system the user must either press <em>ENTER</em> on the keyboard or
-click outside the
-cell that contains the cursor. It is possible to enter
-information for more than one weight system by adding an additional system using
-the + button on the top right hand. Weight systems can be deleted using the
-dustbin icon on the left hand. Here is an example of information for a dive
-with two types of weights: integrated and a weight belt:</p></div>
-<div class="imageblock" style="text-align:center;">
-<div class="content">
-<img src="images/WeightsDataEntry3_f20.jpg" alt="FIGURE: A completed weights information table" />
-</div>
-</div>
-<div class="paragraph"><p>There&#8217;s NO need to click the <em>Save</em> button before the dive
-profile has been completed.</p></div>
-</div>
-<div class="sect3">
-<h4 id="S_CreateProfile">5.1.3. Creating a Dive Profile</h4>
+<h4 id="S_CreateProfile">5.1.1. Creating a Dive Profile</h4>
 <div class="paragraph"><p>The <strong>Dive Profile</strong> (a graphical representation of the depth of the dive as a
 function of time) is indicated in the panel on the top right hand of the
 <em>Subsurface</em> window. When a dive is manually added to a logbook, <em>Subsurface</em>
@@ -868,9 +675,9 @@ dive being described:</p></div>
 </div>
 </div>
 <div class="paragraph"><p><em>Modifying the dive profile</em>: When the cursor is moved around the dive profile,
-its position is indicated by two coloured lines (red and green) as shown below.
-The depth and time
-that the cursor represents are indicated at the top of the black information box
+its position is indicated by two right-angled red lines as shown below.
+The time and depth
+represented by the cursor are indicated at the top of the black information box
 (@ and D). The units (metric/imperial) on the axes are determined by the
 <strong>Preference</strong> settings. The dive profile itself comprises several
 line segments demarcated by waypoints (white dots on the profile, as shown
@@ -879,9 +686,9 @@ If the dive depth was 20 m then the user needs to drag the appropriate waypoints
 downwards to represent 20 m. To add a waypoint, double-click on
 any line segment. To move an additional waypoint, drag it.
 To remove this waypoint, right-click on it and choose "Remove this point" from the
-context menu. The user needs to drag the waypoints to represent an
+context menu. Drag the waypoints to represent an
 accurate
-time duration for the dive. Below is a dive profile that represents a dive
+time duration for the dive. Below is a dive profile for a dive
 to 20 m for 30 min, followed by a 5 minute safety stop at 5 m.</p></div>
 <div class="imageblock" style="text-align:center;">
 <div class="content">
@@ -891,38 +698,23 @@ to 20 m for 30 min, followed by a 5 minute safety stop at 5 m.</p></div>
 <div class="paragraph"><p><em>Specifying the gas composition:</em> The gas composition used is clearly indicated
 along the line segments of the dive profile. This defaults to the first gas
 mixture specified in the <strong>Equipment</strong> tab, which was air in the case of the
-profile illustrated above. The gas mixtures of segments of the dive profile can
+profile above. The gas mixtures of segments of the dive profile can
 be edited. This is done by right-clicking on the particular
 waypoint and selecting the appropriate gas from the context menu. Changing
 the gas for a waypoint affects the gas shown in the segment <em>to the left</em> of
 that
 waypoint. Note that only the gases defined in the <strong>Equipment</strong> tab appear in the
-context menu.</p></div>
+context menu (see image below).</p></div>
 <div class="imageblock" style="text-align:center;">
 <div class="content">
 <img src="images/DiveProfile3_f20.jpg" alt="FIGURE: Gas composition context menu" />
 </div>
 </div>
-<div class="paragraph"><p>Below is the profile of a dive to 25 m for 30 min and with a switch from air to
-EAN50 at the end of the duration at 20m. In this case the first cylinder in the
-<strong>Equipment</strong> tab contained air and the second cylinder contained EAN50.</p></div>
-<div class="imageblock" style="text-align:center;">
-<div class="content">
-<img src="images/DiveProfile4_f20.jpg" alt="FIGURE: Completed dive profile" />
-</div>
-</div>
-</div>
-<div class="sect3">
-<h4 id="_saving_the_hand_entered_dive_information">5.1.4. Saving the hand-entered dive information</h4>
-<div class="paragraph"><p>The information entered in the <strong>Dive Notes</strong> tab, the <strong>Equipment</strong> tab as well as
-the <strong>Dive Profile</strong> can now be saved in the user&#8217;s logbook by using the two
-buttons
-on the top right hand of the Dive Notes tab. If the <em>Save</em> button is clicked,
-the dive data
-are saved in the current logbook. If the <em>Cancel</em> button is clicked, the newly
-entered
-dive data are discarded. When exiting <em>Subsurface</em>, the user will be prompted
-once more to save the logbook with the new dive(s).</p></div>
+<div class="paragraph"><p>With the profile having been defined, more details must be added in order to have
+a fuller record of the dive. To do this,
+the <strong>Notes</strong> and the <strong>Equipment</strong> tabs on the top left hand of the
+<em>Subsurface</em> window should be used. Click on
+<a href="#S_Notes_dc"><strong>this link</strong></a> for instructions to use these tabs.</p></div>
 </div>
 </div>
 <div class="sect2">
@@ -981,12 +773,12 @@ The interface cable should be connected to a free USB port (or the Infra-red
 <li>
 <p>
 The dive computer should be placed into PC Communication mode.
-        (Users should refer to the manual of their specific dive computer)
+        (Refer to the manual of the specific dive computer)
 </p>
 </li>
 <li>
 <p>
-In <em>Subsurface</em>, from the Main Menu, the user must select <em>Import &#8594;  Import
+In <em>Subsurface</em>, from the Main Menu, select <em>Import &#8594;  Import
    From Dive Computer</em>.
    Dialogue <strong>A</strong> in the figure below appears:
 </p>
@@ -999,13 +791,10 @@ In <em>Subsurface</em>, from the Main Menu, the user must select <em>Import &#85
 </div>
 <div class="paragraph"><p>Dive computers tend to keep a certain number of dives in their memory, even
 though these dives have already been imported to <em>Subsurface</em>. For that reason, if
-the divecomputer allows this,
+the dive computer allows this,
 <em>Subsurface</em> only imports dives that have not been uploaded before. This makes
 the download process faster on most dive computers and also saves battery power
-of the dive computer (at least for those not charging while connected via USB).
-If, for some reason, the user wishes to import ALL dives from the dive computer,
-even though some may already be in the logbook, then check the check box labeled
-<em>Force download of all dives</em>.</p></div>
+of the dive computer (at least for those not charging while connected via USB).</p></div>
 <div class="ulist"><ul>
 <li>
 <p>
@@ -1050,7 +839,7 @@ If the checkbox <em>Always prefer downloaded dives</em>
    has been checked and, during download, dives with identical date-times exist on
    the dive computer and on the <em>Subsurface</em>
    <strong>Dive List</strong> panel, the dive in the <em>Subsurface</em> divelog will be overwritten
-   by the dive record from the dive computer
+   by the dive record from the dive computer.
 </p>
 </li>
 <li>
@@ -1068,36 +857,30 @@ Do <strong>not</strong> check the checkboxes labelled <em>Save libdivecomputer l
 </li>
 <li>
 <p>
-Then select the <em>Download</em> button. After successful download, Dialogue <strong>B</strong>
-   in the figure above appears.
-</p>
-</li>
-<li>
-<p>
-With communication established, one can see how the data are
+Then select the <em>Download</em> button.
+   With communication established, one can see how the data are
    retrieved from the dive computer.
    Depending on the make of the dive computer and/or number of recorded dives, this
    could take some time. Be patient. The <em>Download</em> dialogue
    shows a
    progress bar at the bottom of the dialogue (for some dive computers the
    progress information could be inaccurate as we cannot determine how much
-   downloadable data there is until all data have been downloaded). When the
-   download of the dive information is complete, all the imported dives appear
+   downloadable data there is until all data have been downloaded). After successful download, Dialogue <strong>B</strong>
+   in the figure above appears.
+   After the dives have been downloaded, they appear in a tabular format on the right-hand
+   side of the dialogue (see image <strong>B</strong>, above). Each dive comprises a row in the table, with the date, duration
+   and depth shown. Next to each dive is a checkbox: check all the dives that need to
+   be transferred to the <strong>Dive List</strong>. In the case of the image above, the last six dives are
+   checked and will be transferred to the <strong>Dive List</strong>. Then
+   click the <em>OK</em> button at the bottom of the dialogue. All the imported dives appear
    in the <strong>Dive List</strong>, sorted by date and time. Disconnect and
    switch off the dive
    computer to conserve its battery power.
-   If a particular dive is selected, the <strong>Dive Profile</strong> panel shows an informative
-   graph of dive depth against time for that particular dive.
 </p>
 </li>
 </ul></div>
-<div class="paragraph"><p>After the dives have been downloaded, they appear in a tabular format on the righthand
-side of the dialogue (see image <strong>B</strong>, above). Each dive comprises a row in the table, with the date, duration
-and depth shown. Next to each dive is a checkbox: check all the dives that need to
-be transfered to the <strong>Dive List</strong>. In the case of the image above, the last six dives are
-checked and will be transfered to the <strong>Dive List</strong>.</p></div>
 <div class="paragraph"><p>After this has been completed, select the OK button.
-The checked dives are transfered to the <strong>Dive List</strong>.</p></div>
+The checked dives are transferred to the <strong>Dive List</strong>.</p></div>
 <div class="ulist"><ul>
 <li>
 <p>
@@ -1187,13 +970,154 @@ as well as contextual information about the dives recorded on the dive computer.
 </div></div>
 </div>
 <div class="sect3">
-<h4 id="S_DeviceNames">5.2.2. Changing the name of a dive computer</h4>
+<h4 id="S_Bluetooth">5.2.2. Connecting <em>Subsurface</em> to a Bluetooth-enabled dive computer</h4>
+<div class="paragraph"><p>Bluetooth is becoming a more common way of communication between dive computers
+and <em>Subsurface</em>, for instance, the Shearwater Petrel
+Mk2 and the OSTC Mk3. <em>Subsurface</em> provides a largely operating system independent
+Bluetooth interface. Setting up <em>Subsurface</em> for Bluetooth communication requires
+four steps:</p></div>
+<div class="ulist"><ul>
+<li>
+<p>
+Ensure that Bluetooth is activated on the host computer running <em>Subsurface</em>.
+</p>
+</li>
+<li>
+<p>
+Ensure that <em>Subsurface</em> sees the Bluetooth adapter on the host computer.
+</p>
+</li>
+<li>
+<p>
+Ensure the Bluetooth-enabled dive computer is Bluetooth-discoverable and in PC upload mode.
+</p>
+</li>
+<li>
+<p>
+Ensure that <em>Subsurface</em> is paired with the Bluetooth-enabled dive computer.
+</p>
+</li>
+</ul></div>
+<div class="paragraph"><p>Select the Download dialogue by selecting
+<em>Import &#8594; Import from dive computer</em> from the <strong>Main Menu</strong>. If one checks the
+check box labelled <em>"Choose Bluetooth download mode"</em>, the dialogue below appears.</p></div>
+<div class="sect4">
+<h5 id="_on_linux_or_macos">On Linux or MacOS:</h5>
+<div class="imageblock" style="text-align:center;">
+<div class="content">
+<img src="images/DC_import_Bluetooth.jpg" alt="FIGURE: Download Bluetooth" />
+</div>
+</div>
+<div class="paragraph"><p>On the <em>Linux</em> or <em>MacOS</em> platforms the name
+of the <em>Subsurface</em> computer and its Bluetooth address are shown on the right-hand side, On the lefthand side, if the
+computer has connected more than one local Bluetooth devices the user can use
+the list box to indicate which one needs to connect to <em>Subsurface</em>.
+The power state (on/off) of the Bluetooth adapter is shown below
+the address and can be changed by checking the <em>Turn on/off</em> check box.</p></div>
+<div class="paragraph"><p>If the Bluetooth address is not shown, then <em>Subsurface</em> does not see the local
+Bluetooth device. Ensure that the Bluetooth driver is installed correctly on the
+<em>Subsurface</em> computer and check if it can be used by other Bluetooth utilities like
+<em>bluetoothctl</em> or <em>bluemoon</em>. This achieves the first two steps above.</p></div>
+<div class="paragraph"><p>Ensure that the Bluetooth-enabled dive computer is in PC-upload mode and that it
+is discoverable by other Bluetooth devices. Consult the manual of the dive
+computer to perform this. Now the third item in the list above has been achieved.</p></div>
+<div class="paragraph"><p>Select the <em>Scan</em> button towards the bottom left of the dialogue above. After
+searching for a small amount of time, the dive computer should be listed
+(perhaps as one of a number of Bluetooth devices) in the main list box on the
+lefthand side of the dialogue (see image above). If this is not achieved, select
+the <em>Clear</em> button and then scan again for Bluetooth devices using the <em>Scan</em>
+button. After performing these actions <em>Subsurface</em> should see the dive computer.
+The label of the discovered dive computer contains the name of the device, its
+address and its pairing status. If the device is not paired and has a red
+background colour, a context menu can be opened by selecting the item with a
+right-click.
+Select the the <em>Pair</em> option and wait for the task to complete.</p></div>
+<div class="sidebarblock">
+<div class="content">
+<div class="admonitionblock">
+<table><tr>
+<td class="icon">
+<img src="images/icons/important.png" alt="Important" />
+</td>
+<td class="content">Currently <em>Subsurface</em> does not support Bluetooth pairing with dive
+computers that require a custom PIN code. In order to pair the devices, use other
+OS utilities as suggested below.</td>
+</tr></table>
+</div>
+<div class="paragraph"><p>One way to achieve this is to use <code>bluetoothctl</code>:</p></div>
+<div class="literalblock">
+<div class="content">
+<pre><code>$ bluetoothctl
+[bluetooth]# agent KeyboardOnly
+Agent registered
+[bluetooth]# default-agent
+Default agent request successful
+[bluetooth]# pair 00:80:25:49:6C:E3
+Attempting to pair with 00:80:25:49:6C:E3
+[CHG] Device 00:80:25:49:6C:E3 Connected: yes
+Request PIN code
+[agent] Enter PIN code: 0000</code></pre>
+</div></div>
+</div></div>
+<div class="paragraph"><p>After the devices are paired the <em>Save</em> button of the dialogue can be pressed.
+This closes the Bluetooth dialogue. Now select <em>Download</em> in the <em>Download from
+dive computer</em> dialogue which should still be open. The downloaded dives are
+shown on the righthand side of the download dialogue.</p></div>
+</div>
+<div class="sect4">
+<h5 id="_on_windows">On Windows:</h5>
+<div class="imageblock" style="text-align:center;">
+<div class="content">
+<img src="images/DC_import_Bluetooth_Windows.png" alt="FIGURE: Download Bluetooth on Windows" />
+</div>
+</div>
+<div class="paragraph"><p>On <em>Windows</em> platforms the <em>Local Bluetooth device details section</em> on the right is not displayed.
+To successfully initiate a scan (by pressing the <em>Scan</em> button)
+check that the Bluetooth device on the <em>Subsurface</em> computer is turned on.</p></div>
+<div class="paragraph"><p>The pairing step is checked and done automatically during
+the download process. If the devices have never been paired the system will ask
+for your permissions and put a message on the right side of the screen: <em>Add a
+device, Tap to set up your DC device</em>. Always allow this pairing. After a
+discovered item is selected, select the <em>Save</em> button.
+Finally select the <em>Download</em> button on the <em>Download</em> dialogue and wait for the process to complete.</p></div>
+<div class="admonitionblock">
+<table><tr>
+<td class="icon">
+<img src="images/icons/important.png" alt="Important" />
+</td>
+<td class="content">Be aware that currently <em>Subsurface</em> works only with local Bluetooth
+adapters which use Microsoft Bluetooth Stack. If the local device uses
+<em>Widcomm</em>,  <em>Stonestreet One Bluetopia Bluetooth</em> or <em>BlueSolei</em> drivers it
+will definitely not work.</td>
+</tr></table>
+</div>
+<div class="paragraph"><p>A log messageOn the bottom left of the <em>Remote Bluetooth device selection</em>
+shows details about the current status of the Bluetooth agent. To
+select another dive computer for download using the "Remote Bluetooth selection dialogue"
+press the three-dots button from the <em>"Choose Bluetooth download mode"</em> option.</p></div>
+<div class="admonitionblock">
+<table><tr>
+<td class="icon">
+<img src="images/icons/important.png" alt="Important" />
+</td>
+<td class="content"><strong>IN CASE OF PROBLEMS</strong>:  If the Bluetooth adapter from the <em>Subsurface</em> computer
+gets stuck and the <em>Download</em> process fails repeatedly,
+ <em>unpair</em> the devices and then repeat the above steps. If this is not successful,
+ <a href="#S_HowFindBluetoothDeviceName"><em>Appendix A</em></a> contains
+information for manually setting up and inspecting the Bluetooth connection
+with <em>Subsurface</em>.</td>
+</tr></table>
+</div>
+</div>
+</div>
+<div class="sect3">
+<h4 id="S_DeviceNames">5.2.3. Changing the name of a dive computer</h4>
 <div class="paragraph"><p>It may be necessary to distinguish between different dive computers used to
 upload dive logs to <em>Subsurface</em>. For instance if one&#8217;s partner&#8217;s dive computer is the
 same make and model as one&#8217;s own and dive logs are uploaded from both dive computers
 to the same <em>Subsurface</em> computer, then
 one would perhaps like to call one dc "Alice&#8217;s Suunto D4" and the other one
-"Bob&#8217;s Suunto D4". Alternatively, perhaps a technical diver dives with two or more
+"Bob&#8217;s Suunto D4". Alternatively, consider a technical diver dives with two or more
 dive computers of the same model, the logs of both (or all) being uploaded.
 In this case it might be prudent to call one of them
 "Suunto D4 (1)" and another one "Suunto D4 (2)". This is easily done in <em>Subsurface</em>.
@@ -1204,65 +1128,102 @@ show the nickname for that particular device instead of the model name,
 allowing easy identification of devices.</p></div>
 </div>
 <div class="sect3">
-<h4 id="S_EditDiveInfo">5.2.3. Updating the dive information imported from the dive computer.</h4>
+<h4 id="S_EditDiveInfo">5.2.4. Updating the dive information imported from the dive computer.</h4>
 <div class="paragraph"><p>With the uploaded dives in the <strong>Dive List</strong>, the information from the dive
 computer is not complete and more details must be added in order to have
 a fuller record of the dives. To do this,
-the <strong>Dive Notes</strong> and the <strong>Equipment</strong> tabs on the top left hand of the
+the <strong>Notes</strong> and the <strong>Equipment</strong> tabs on the top left hand of the
 <em>Subsurface</em> window should be used.</p></div>
-</div>
-<div class="sect3">
-<h4 id="_dive_notes_2">5.2.4. Dive Notes</h4>
-<div class="paragraph"><p>The date and time of the dive, gas mixture and (often) water temperature are usually
-shown as obtained from the dive computer, but the user needs to add
-additional information by hand in order to have a more complete dive record. In a few cases,
-(e.g. APD rebreathers) one also has to provide the date and time of the dive.
-If the contents of this tab is changed or edited in any way, the message in a blue box at
+<div class="sect4">
+<h5 id="S_Notes_dc">Notes</h5>
+<div class="paragraph"><p>To have a more complete dive record the user needs to add
+additional information by hand. The procedure
+below is virtually identical for hand-entered dives and for dives downloaded from a dive computer.</p></div>
+<div class="paragraph"><p>In some cases,
+one has to provide the date and time of the dive, e.g. when entering a dive by hand or when a
+dive computer does not provide the date and time of the dive.
+(Usually the date and time of the dive, gas mixture and water temperature are
+shown as obtained from the dive computer)
+If the contents of the <strong>Notes tab</strong> is changed or edited in any way, the message in a blue box at
 the top of the panel indicates that the dive is being edited. If one
-clicks on the <strong>Dive Notes</strong> tab, the following fields are
-visible:</p></div>
+clicks on the <strong>Notes</strong> tab, the following fields are
+visible (left hand image, below):</p></div>
 <div class="imageblock" style="text-align:center;">
 <div class="content">
-<img src="images/AddDive3_f20.jpg" alt="FIGURE: The Dive Notes tab" />
+<img src="images/AddDive3_f22.jpg" alt="FIGURE: The Notes tab" />
 </div>
 </div>
-<div class="paragraph"><p>The <strong>Time</strong> field reflects the date and time of the dive. By clicking
+<div class="paragraph"><p>The right hand image, above, shows a <strong>Notes tab</strong> filled with dive information.
+The <strong>Time</strong> field reflects the date and time of the dive. By clicking
 the date, a calendar is displayed from which
 one can choose the correct date. Press ESC to close the calendar.
 The time values (hour and minutes) can also be
-edited directly by clicking on each of them in the text box and by overtyping the
+edited directly by clicking on each of them in the text box and by over-typing the
 information displayed.</p></div>
 <div class="paragraph"><p><strong>Air/water temperatures</strong>: Air and water temperatures during the dive are shown
-in these fields to the right of the Start time. Many dive computers supply water
-temperature information and this field may therefore contain information obtained from the dive computer.
+in text boxes to the right of the Start time. Many dive computers supply water
+temperature information and this box may therefore contain information.
 If air temperature is not provided by the dive computer, the first temperature reading
 might be used for the air temperature. Generally this is close enough to the real air temperature as
 the change in the temperature sensor reading is quite slow to follow the changes in the environment.
 If editing is required, only a value is required, the units of temperature will be
 automatically supplied by
-<em>Subsurface</em> (according to the <em>Preferences</em>, metric or imperial units will
+<em>Subsurface</em> (following the <em>Preferences</em>, metric or imperial units will
 be used).</p></div>
-<div class="paragraph"><p><strong>Location</strong>: In this field one should type in text that describes the site
-where the dive was performed, e.g. "Tihany, Lake Balaton, Hungary".
-Auto completion of location names will
-make this easier if one frequently dives at the same sites.</p></div>
-<div class="paragraph"><p><strong>Coordinates</strong>: The geographic coordinates of the dive site should be entered
-here. These can come from three sources:</p></div>
+<div class="paragraph"><p><strong>Location</strong>:</p></div>
+<div class="admonitionblock">
+<table><tr>
+<td class="icon">
+<img src="images/icons/warning2.png" alt="Warning" />
+</td>
+<td class="content">Dive locations are managed as a <strong>separate</strong> part of the dive log.
+The dive information in the <strong>Notes</strong> and <strong>Equipment</strong> tabs can therefore not be edited at the same
+time as the dive site information. Save all the other dive information (e.g.
+divemaster, buddy, protective gear, notes about the dive) by selecting <em>Apply changes</em> on the
+<strong>Notes</strong> tab before editing the dive site information. Only then, supply a dive site name in the
+textbox labelled <em>Location</em> on the <strong>Notes</strong> tab.</td>
+</tr></table>
+</div>
+<div class="paragraph"><p>Type the name of the dive site, e.g. "Tihany, Lake Balaton, Hungary".
+If several dives are
+performed at the same location, the dive site information for the first dive is re-used.
+Existing dive location information
+can be edited at any time by selecting (on the <strong>Dive List</strong> panel) a dive performed at that site
+and by opening the location information by clicking the globe button on the
+right of the location name (see image on the right, above). When entering a dive location name, auto location of
+dive site names makes it easy to select an existing dive site name
+(i.e. when typing the name of a dive site,
+a dropdown list appears showing all sites with similar names). If the dive
+site has been used before, click on the already-existing name.
+The dive site names in the dropdown list contain either a globe symbol (indicating
+existing dive sites in the <em>Subsurface</em> database)
+or a <strong>+</strong> symbol (indicating dive site names that appear consistent with the
+current dive site name but which have not been added to the dive site database).
+Therefore, if the present
+dive site has not been used before, a message appears as follows (image <strong>A</strong> below):</p></div>
+<div class="imageblock" style="text-align:center;">
+<div class="content">
+<img src="images/Locations1_f22.jpg" alt="FIGURE:Location description panel" />
+</div>
+</div>
+<div class="paragraph"><p>Doubleclick on the new dive site name. A panel appears to enter the coordinates and
+other important information about the site (image <strong>B</strong>, above). The most important
+items are the coordinates of the site. There are three ways of specifying the coordinates:</p></div>
 <div class="olist loweralpha"><ol class="loweralpha">
 <li>
 <p>
-The user can find the coordinates on the world map in the bottom right hand
+One can find the coordinates on the world map in the bottom right hand
    part
-   of the Subsurface window. The map displays a green bar indicating "Move the map
-   and double-click to set the dive location". Double-click
-   at the appropriate place, the green bar disappears and the coordinates are
+   of the <em>Subsurface</em> window. The map displays an orange bar indicating "No location
+   data - Move the map and double-click to set the dive location". Upon a doubleclick
+   at the appropriate place, the orange bar disappears and the coordinates are
    stored.
 </p>
 </li>
 <li>
 <p>
-The user can obtain the coordinates from the <em>Subsurface</em> Companion app if
-   an Android or iPhone device with GPS was used and if the coordinates of the dive site
+The coordinates can be obtained from the <em>Subsurface</em> Companion app if the
+   user has an Android or iPhone device with GPS and if the coordinates of the dive site
    were stored using that device.
    <a href="#S_Companion">Click here for more information</a>
 </p>
@@ -1282,29 +1243,46 @@ Decimal degrees, e.g. 30.22496 , 30.821798</code></pre>
 </li>
 </ol></div>
 <div class="paragraph"><p>Southern hemisphere latitudes are given with a <strong>S</strong>, e.g. S30°, or with a
-negative value, e.g. -30.22496. Similarly, western longitudes are given with a
-<strong>W</strong>, e.g. W07°, or with a negative value, e.g. -7.34323.</p></div>
-<div class="paragraph"><p>Please note that GPS coordinates of a dive site are linked to the Location
-name - so adding coordinates to dives that do not have a location description
-will cause unexpected behaviour (Subsurface will think that all of these
+negative value, e.g. -30.22496. Similarly western longitudes are given with a
+<strong>W</strong>, e.g. W07°, or with a negative value, e.g. -7.34323. Some keyboards
+don&#8217;t have the degree sign (°). It can be replaced by a <strong>d</strong> like this: N30d W20d.
+If both a dive site name and coordinates have been provided, Save the
+dive site information by selecting the button <em>Apply changes</em> at the top of
+the panel.</p></div>
+<div class="paragraph"><p><strong>Important</strong>: GPS coordinates of a dive site are linked to the Location
+name - so <strong>saving</strong> a dive site with only coordinates and no dive site name
+causes unexpected behaviour (Subsurface will think that all of these
 dives have the same location and try to keep their GPS coordinates the
 same).</p></div>
+<div class="paragraph"><p><strong>Dive site name lookup:</strong> If coordinates have been typed into the appropriate
+text box, one can perform an automated name lookup based on the coordinates.
+This is achieved when <em>Subsurface</em> uses the Internet to find the name of the dive site
+based on the coordinates that were typed. If a name has been found, it is
+automatically inserted into the tags box. The list box
+(Titled <em>Dive sites on same coordinates</em>") at the bottom
+of the dive site panel contains the names of other dives sites used at the
+current location. For instance if the dive site is "Blue Hole" and there are several
+dive sites named "Blue Hole", all these sites are listed in this list box.</p></div>
+<div class="paragraph"><p>Enter any other textual information about the dive site (Description and Notes),
+then select <em>Apply Changes</em> to save the geolocation for this dive site. At a later stage
+the dive site information can be edited by clicking the globe icon to the right of the
+dive site name in the <strong>Notes tab</strong>.</p></div>
 <div class="paragraph"><p><strong>Dive mode</strong>: This is a dropdown box allowing one to choose the type of dive
-performed. The options are OC (Open Circuit, the default seting, meant for most recreational dives),
+performed. The options are OC (Open Circuit SCUBA, the default seting, meant for most recreational dives),
 Freedive (dive without SCUBA equipment), CCR (Closed-circuit
 rebreather) and pSCR (Passive semi-closed rebreather).</p></div>
 <div class="paragraph"><p><strong>Divemaster</strong>: The name of the dive master or dive guide for this dive should be
 entered in this field
-which offers auto completion based on the list of dive masters in
+which offers auto selection based on the list of dive masters in
 the current logbook.</p></div>
 <div class="paragraph"><p><strong>Buddy</strong>: In this field, one enters the name(s) of the buddy / buddies
 (separated with commas) who accompanied him/her on the
-dive. Auto completion based on the list of buddies in the current logbook is
+dive. Auto selection based on the list of buddies in the current logbook is
 offered.</p></div>
-<div class="paragraph"><p><strong>Suit</strong>: Here the type of diving suit used for the dive can be entered.
-Auto completion of the suit description is available.
+<div class="paragraph"><p><strong>Suit</strong>: Here the type of dive suit used can be entered.
+Auto selection of the suit description is available.
 Some dry-suit users may choose to use this field to record what combination of
-suit and thermal protection undersuit was used.</p></div>
+suit and thermal undersuit was used.</p></div>
 <div class="paragraph"><p><strong>Rating</strong>: One can provide a subjective overall rating of the dive on a
 5-point scale by clicking the appropriate star on the rating scale.</p></div>
 <div class="paragraph"><p><strong>Visibility</strong>: Similarly, one can provide a rating of visibility during the
@@ -1319,29 +1297,24 @@ will list the tags that correspond to the typing. For instance, if the user
 typed
 <code>cav</code>, then the tags <strong>cave</strong> and <strong>cavern</strong> are shown for the user to choose from.</p></div>
 <div class="paragraph"><p><strong>Notes</strong>: Any additional information for the dive can be entered here.</p></div>
-<div class="paragraph"><p>The <strong>Save</strong> and <strong>Cancel</strong> buttons are used to save all the information for tabs
-in the info panel and in the dive profile panel, so there&#8217;s no need to use them
-until ALL other information has been added. Here is an example of a completed
-Dive Notes panel:</p></div>
-<div class="imageblock" style="text-align:center;">
-<div class="content">
-<img src="images/CompletedDiveInfo_f20.jpg" alt="FIGURE: A completed Dive Notes tab" />
+<div class="paragraph"><p>The <em>Apply changes</em> and <em>Discard changes</em> buttons are used to save all the information for tabs
+in the <strong>Info</strong> panel and in the <strong>Dive Profile</strong> panel, so there&#8217;s no need to use them
+until <strong>ALL</strong> other information has been added. The image <a href="#S_Notes_dc">at the beginning of this section</a>
+shows an example of a <strong>Notes tab</strong> after completion of the dive information.</p></div>
 </div>
-</div>
-</div>
-<div class="sect3">
-<h4 id="_equipment_2">5.2.5. Equipment</h4>
+<div class="sect4">
+<h5 id="_equipment">Equipment</h5>
 <div class="paragraph"><p>The Equipment tab allows one to enter information about the type of
 cylinder and gas used as well as the weights used for the dive. The
 message in a blue box at the top of the panel:</p></div>
 <div class="imageblock" style="text-align:center;">
 <div class="content">
-<img src="images/BlueEditBar_f20.jpg" alt="FIGURE: Blue edit bar" />
+<img src="images/BlueEditBar_f22.jpg" alt="FIGURE: Blue edit bar" />
 </div>
 </div>
 <div class="paragraph"><p>indicates that the dive is being edited. This is a highly interactive part of
 <em>Subsurface</em> and the information on
-cylinders and gases (entered here) determines the behaviour of the dive profile
+cylinders and gases (entered here) determines the behaviour of the <strong>Dive profile</strong>
 (top right-hand panel).</p></div>
 <div class="paragraph" id="cylinder_definitions"><p><strong>Cylinders</strong>: The cylinder information is entered through a dialogue that looks
 like this:</p></div>
@@ -1350,14 +1323,15 @@ like this:</p></div>
 <img src="images/DC_gas-dialogue1_f20.jpg" alt="FIGURE: Initial cylinder dialogue" />
 </div>
 </div>
-<div class="paragraph"><p>In most cases <em>Subsurface</em> obtains the gas used from the dive computer and
-automatically inserts the gas composition(% oxygen) in the table. The + button
+<div class="paragraph"><p>For hand-entered dives, this information needs to be typed in. For dive computers,
+<em>Subsurface</em> often obtains the gas used from the dive computer and
+automatically inserts the gas composition(% oxygen or % helium) in the table. The + button
 at the top right allows the user to add more cylinders for this dive. The dark
 dustbin icon on the left allows the deletion of information for a cylinder.
 Note that it is not possible to delete a cylinder if it is used during the
 dive. A cylinder might be implicitly used in the dive, even without a gas change event.</p></div>
 <div class="paragraph"><p>The user should start by selecting a cylinder type on the left-hand side of the
-table.  To select a cylinder, the <strong>cylinder type</strong> box should be clicked. This
+table.  To select a cylinder, the <em>Type</em> box should be clicked. This
 brings up a list button that can be used to display a dropdown list of
 cylinders:</p></div>
 <div class="imageblock" style="text-align:center;">
@@ -1368,18 +1342,18 @@ cylinders:</p></div>
 <div class="paragraph"><p>The drop-down list can then be used to select the cylinder type that was used
 for this dive or the user may start typing in the box which shows the available
 options for the entered characters. The
-<strong>Size</strong> of the cylinder as well as its working pressure (<strong>WorkPress</strong>) will
+<strong>Size</strong> of the cylinder as well as its working pressure (<em>Work.press</em>) will
 automatically be shown in the dialogue.</p></div>
-<div class="paragraph"><p>Next one must indicate the starting pressure and the ending pressure of the
+<div class="paragraph"><p>Next, indicate the starting pressure and the ending pressure of the
 specified gas during the dive. The unit of pressure (metric/imperial)
 corresponds to the settings chosen in the <em>Preferences</em>.</p></div>
 <div class="paragraph"><p>Finally, provide the gas mixture used. If air was used, the
 value of 21%  can be entered  or this field can be left blank. If nitrox or
 trimix were used, their percentages of oxygen and/or helium should be entered.
 Any inappropriate fields should be left empty. After typing the
-information for the cylinder,
-either press <em>ENTER</em> on the keyboard or click outside the cell
-that contains
+information for the cylinder, save the data
+either by pressing <em>ENTER</em> on the keyboard or by clicking outside the cell
+containing
 the cursor. Information for any additional cylinders can be added by using the<br />
 button at the top right hand. Following is an example of a complete description
 for a dive using two cylinders (air and EAN50):</p></div>
@@ -1398,20 +1372,20 @@ this:</p></div>
 <img src="images/WeightsDataEntry1_f20.jpg" alt="FIGURE:The Weights dialogue" />
 </div>
 </div>
-<div class="paragraph"><p>By clicking on the <strong>Type</strong> field, a drop-down list becomes accessible through a
+<div class="paragraph"><p>By clicking on the <em>Type</em> field, a drop-down list becomes accessible through a
 down-arrow:</p></div>
 <div class="imageblock" style="text-align:center;">
 <div class="content">
 <img src="images/WeightsDataEntry2_f20.jpg" alt="FIGURE:Weights type drop-down list button" />
 </div>
 </div>
-<div class="paragraph"><p>The drop-down list can then be used to select the type of weight system
+<div class="paragraph"><p>This can be used to select the type of weight system
 used during the dive or the user may start typing in the box
-which shows the available options for the entered characters.
+to specify a different weighting mechanism that will be saved by <em>Subsurface</em>.
 In the <strong>Weight</strong>
 field, type in the amount of weight used during the dive. After
 specifying the weight
-system, the user can either press <em>ENTER</em> on the keyboard or click outside the
+system, save the data by either pressing <em>ENTER</em> on the keyboard or by clicking outside the
 cell with the cursor.
 It is possible to enter information for more than one weight system by adding
 an additional system
@@ -1424,19 +1398,20 @@ with two types of weights: integrated as well as a weight belt:</p></div>
 </div>
 </div>
 </div>
+</div>
 <div class="sect3">
-<h4 id="_editing_several_selected_dives_simultaneously">5.2.6. Editing several selected dives simultaneously</h4>
+<h4 id="_editing_several_selected_dives_simultaneously">5.2.5. Editing several selected dives simultaneously</h4>
 <div class="paragraph"><p><em>METHOD 1</em>: After uploading dives from
-a dive computer, the dive profiles of the uploaded dives are shown in the <strong>Dive profile</strong> tab, as well
+a dive computer, the dive profiles of each uploaded dive is shown in the <strong>Dive profile</strong> tab, as well
 as a few items of information
-in the <strong>Dive Notes</strong> tab (e.g. water temperature) and in the <strong>Equipment</strong> tab (e.g. gas pressures
+in the <strong>Notes</strong> tab (e.g. water temperature) and in the <strong>Equipment</strong> tab (e.g. gas pressures
 and gas composition). However the other fields remain empty.
 It may be useful to simultaneously edit some of the
-fields in the <strong>Dive Notes</strong> and <strong>Equipment</strong> tabs.  For instance, it is possible
+fields in the <strong>Notes</strong> and <strong>Equipment</strong> tabs.  For instance, it is possible
 that a diver performed several dives during a single day, using identical equipment while diving at the same
 dive site or with the same dive master and/or buddy or tags. Instead of completing the information for each
 of these dives separately, one can select all the dives for that day in the <strong>Dive List</strong> and
-insert the same information in the <strong>Dive Notes</strong> and <strong>Equipment</strong> fields that need
+insert the same information in the <strong>Notes</strong> and <strong>Equipment</strong> fields that need
 identical information. This is achieved by editing the dive notes or the equipment for any one
 of the selected dives.</p></div>
 <div class="paragraph"><p>The simultaneous editing only works with fields that do not already contain information.
@@ -1449,15 +1424,15 @@ edited dive is
 changed, even though several dives have been selected in the <strong>Dive List</strong>. This greatly speeds
 up the completion of the dive log after several similar dives.</p></div>
 <div class="paragraph" id="S_CopyComponents"><p><em>METHOD 2</em>:There is a different way of achieving the same goal. Select a dive with all the appropriate information
-typed into the <strong>Dive Notes</strong> and <strong>Equipment</strong> tabs. Then, from the main menu, select <em>Log &#8594;  Copy dive components</em>.
-A box is presented with a selection of check boxes for most of the fields in the <strong>Dive Notes</strong> and <strong>Equipment</strong> tabs.
+typed into the <strong>Notes</strong> and <strong>Equipment</strong> tabs. Then, from the main menu, select <em>Log &#8594;  Copy dive components</em>.
+A box is presented with a selection of check boxes for most of the fields in the <strong>Notes</strong> and <strong>Equipment</strong> tabs.
 Select the fields to be copied from the currently selected dive, then select <em>OK</em>. Now, in the <strong>Dive List</strong>,
 select the dives
 into which this information is to be pasted. Then, from the main menu, select <em>Log &#8594;  Paste dive components</em>.
 All the selected dives now contain the data initially selected in the original source dive log.</p></div>
 </div>
 <div class="sect3">
-<h4 id="_adding_bookmarks_to_a_dive">5.2.7. Adding Bookmarks to a dive</h4>
+<h4 id="_adding_bookmarks_to_a_dive">5.2.6. Adding Bookmarks to a dive</h4>
 <div class="paragraph"><p>Many divers wish to annotate their dives with text that indicate particular events
 during the dive, e.g. "Saw dolphins", or "Released surface buoy". This is easily
 done:</p></div>
@@ -1494,17 +1469,16 @@ If one hovers using the mouse over the red bookmark, the appropriate text is sho
 </div>
 </div>
 <div class="sect3">
-<h4 id="_saving_the_updated_dive_information">5.2.8. Saving the updated dive information</h4>
-<div class="paragraph"><p>The information entered in the <strong>Dive Notes</strong> tab and the <strong>Equipment</strong> tab can be
-saved by
-using the
-two buttons on the top right hand of the <strong>Dive Notes</strong> tab. If the <em>Save</em> button
+<h4 id="_saving_the_updated_dive_information">5.2.7. Saving the updated dive information</h4>
+<div class="paragraph"><p>The information entered in the <strong>Notes</strong> tab and the <strong>Equipment</strong> tab can be
+saved by using the
+two buttons on the top right hand of the <strong>Notes</strong> tab. If the <em>Apply changes</em> button
 is clicked,
-the dive data are saved. If the <em>Cancel</em> button is clicked, then the newly
-entered dive data are
-deleted, although the dive profile obtained from the dive computer will be
+the dive data are saved in the memory image of the dive. If the <em>Discard changes</em>
+button is clicked, then the newly entered dive data are
+erased from the computer memory, although the dive profile is
 retained. When the user exits <em>Subsurface</em> there is a final prompt to confirm
-that the new data should be saved.</p></div>
+that the new data should now be saved permanently on the computer disk.</p></div>
 </div>
 </div>
 <div class="sect2">
@@ -1522,7 +1496,7 @@ Currently, <em>Subsurface</em> supports importing CSV log files from several sou
 APD LogViewer, XP5, Sensus and Seabear files are
 preconfigured, but because the import is flexible, users can configure their own
 imports.
-Manually kept log files (e.g. in spreadsheet) can also be imported by
+Manually kept log files (e.g. a spreadsheet) can also be imported by
 configuring the CSV import.
 <em>Subsurface</em> can also import UDDF and UDCF files used by some divelog
 software and some dive computers, like the Heinrichs &amp; Weikamp DR5. Finally,
@@ -1538,12 +1512,13 @@ tries to detect multiple records for
 the same dive and merges the information as best as it can. If
 there are no time zone issues (or other reasons that would cause the
 beginning time of the dives to be significantly different) <em>Subsurface</em>
-will not create duplicate entries.</p></div>
+will not create duplicate entries. Below follows more specific information
+to achieve data import to <em>Subsurface</em>.</p></div>
 <div class="sect3">
 <h4 id="_using_the_universal_import_dialogue">5.3.1. Using the universal import dialogue</h4>
 <div class="paragraph" id="Unified_import"><p>Importing dives from other software is performed through a universal interface
-that is activated by selecting <em>Import</em> from the Main Menu, then clicking on
-<em>Import Log Files</em>. This brings up the dialogue <strong>A</strong> below.</p></div>
+activated by selecting <em>Import</em> from the Main Menu, then clicking on
+<em>Import Log Files</em>. This brings up dialogue <strong>A</strong>, below.</p></div>
 <div class="imageblock" style="text-align:center;">
 <div class="content">
 <img src="images/Import1_f20.jpg" alt="FIGURE: Import dialogue: step 1" />
@@ -1560,6 +1535,11 @@ XML-formatted dive logs (DivingLog 5.0, MacDive and several other dive log syste
 </li>
 <li>
 <p>
+Cochran dive logs
+</p>
+</li>
+<li>
+<p>
 UDDF-formatted dive logs (e.g. Kenozoooid)
 </p>
 </li>
@@ -1575,6 +1555,26 @@ Poseidon MkVI CCR logs
 </li>
 <li>
 <p>
+APD Inspiration/Evolution CCR logs
+</p>
+</li>
+<li>
+<p>
+LiquiVision logs
+</p>
+</li>
+<li>
+<p>
+divelog.de logs
+</p>
+</li>
+<li>
+<p>
+OSTC Tools logs
+</p>
+</li>
+<li>
+<p>
 JDiveLog
 </p>
 </li>
@@ -1589,12 +1589,30 @@ CSV (text-based and spreadsheet-based) dive logs, including APD CCR logs
 </p>
 </li>
 </ul></div>
-<div class="paragraph"><p>Selecting the appropriate file in the file list of the dialogue opens
+<div class="paragraph"><p>Selecting the appropriate format and then the specific log file in the large window
+containing the file list on the right of the dialogue opens
 the imported dive log in the <em>Subsurface</em> <strong>Dive List</strong>. Some other formats, not
 accessible through the Import dialogue are also supported, as explained below.</p></div>
 </div>
 <div class="sect3">
-<h4 id="_importing_from_mares_dive_organiser_v2_1">5.3.2. Importing from Mares Dive Organiser V2.1</h4>
+<h4 id="_importing_from_ostctools">5.3.2. Importing from  OSTCTools</h4>
+<div class="paragraph"><p><em>OSTC Tools</em> is a Microsoft-based suite of dive download and dive management tools for the OSTC
+family of dive computers. <em>OSTC Tools</em> downloads dive data from the dive computer and stores it
+as a binary file with file extension <em>.dive</em> . Subsurface can directly import these files when using
+the universal import dialogue. From the dropdown list at the bottom right select
+<em>OSTCTools Files (.dive .DIVE)</em>. This makes the <em>OSTC Tools</em> dive logs visible in the file list
+panel. Select one or more dive, then click the <em>Open</em> button. The OSTC dives are shown in the
+<strong>Dive List</strong> panel.</p></div>
+<div class="paragraph"><p>Actually, all H&amp;W devices supported by OSTCTools can be imported to <em>Subsurface</em>, this includes
+OSTC, OSTC Mk2, OSTC 2N/2C, OSTC3, OSTC Sport, and probably although untested, Frog, OSTC2 and
+OSTC CR.</p></div>
+<div class="paragraph"><p>Please, remember that OSTCTools is <strong>not</strong> a true diving log software, but a useful set of tools
+for analysis and management of OSTC devices. This way, only raw dive computer data will be
+performed with the import to <em>Subsurface</em>; one has to to manually complete the rest of
+data which may be important (buddies, equipment, notes, etc).</p></div>
+</div>
+<div class="sect3">
+<h4 id="_importing_from_mares_dive_organiser_v2_1">5.3.3. Importing from Mares Dive Organiser V2.1</h4>
 <div class="paragraph"><p>Since Mares utilise proprietary Windows software not compatible with
 multi-platform applications, these dive logs cannot be
 directly imported into
@@ -1603,7 +1621,7 @@ using <em>www.divelogs.de</em> as a mechanism to extract the dive log informatio
 <div class="olist arabic"><ol class="arabic">
 <li>
 <p>
-The dive log data from Mares Dive Organiser need to be exported to the user&#8217;s
+Export the dive log data from Mares Dive Organiser to the user&#8217;s
    desktop, using
    a <em>.sdf</em> file name extension. Refer to <a href="#Mares_Export">Appendix C</a> for more
    information.
@@ -1628,16 +1646,16 @@ Finally,  import the dives
 </ol></div>
 </div>
 <div class="sect3">
-<h4 id="S_ImportingDivelogsDe">5.3.3. Importing dives from <strong>divelogs.de</strong></h4>
+<h4 id="S_ImportingDivelogsDe">5.3.4. Importing dives from <strong>divelogs.de</strong></h4>
 <div class="paragraph"><p>The import of dive information from <em>divelogs.de</em> is simple, using a single
 dialogue box. The <em>Import &#8594;  Import from Divelogs.de</em> option should be selected
 from the Main Menu. This
-brings up a dialogue box (see figure on left [<strong>A</strong>] below). Enter a
+brings up a dialogue box (see image <strong>A</strong> below). Enter a
 user-ID and password for <em>divelogs.de</em> into the appropriate fields and then
 select
 the <em>Download</em> button. Download from <em>divelogs.de</em> starts immediately,
 displaying a progress bar in the dialogue box. At the end of the download, the
-success status is indicated (see figure on the right [<strong>B</strong>], below). The
+success status is indicated (see image <strong>B</strong>, below). The
 <em>Apply</em> button should then be selected, after which the imported dives appear in the
 <em>Subsurface</em> <strong>Dive List</strong> panel.</p></div>
 <div class="imageblock" style="text-align:center;">
@@ -1647,7 +1665,7 @@ success status is indicated (see figure on the right [<strong>B</strong>], below
 </div>
 </div>
 <div class="sect3">
-<h4 id="S_ImportingCSVData">5.3.4. Importing data in CSV format</h4>
+<h4 id="S_ImportingCSVData">5.3.5. Importing data in CSV format</h4>
 <div class="paragraph"><p>A comma-separated file (.csv) can be used to import dive information either as dive profiles
 (as in the case of the APD Inspiration and Evolution closed circuit rebreathers) or as dive
 metadata (in case the user keeps dive data in a spreadsheet). The <em>CSV</em> format is a universal
@@ -1692,10 +1710,10 @@ things about the data being imported</strong>:</p></div>
 <li>
 <p>
 Which character separates the different columns within a single line of
-   data? This field separator should be either a comma (,) or a TAB character.
+   data? This field separator should be either a comma (,) a semicolon (;) or a TAB character.
    This can be determined by opening the file with a text editor. If it is
-   comma-delimited, then the comma
-   characters between the values are clearly visible. If no commas are evident and
+   comma-delimited or semicolon-delimited, the comma or semicolon
+   characters between the values are clearly visible. If these are not evident and
    the numbers are aligned in columns,
    the file is probably TAB-delimited (i.e. it uses a TAB as a field separator).
 </p>
@@ -1709,7 +1727,7 @@ Which data columns need to be imported into <em>Subsurface</em>? Is it a <em>CSV
 </li>
 <li>
 <p>
-Is the numeric information (e.g. dive depth) in metric or in imperial unis?
+Is the numeric information (e.g. dive depth) in metric or in imperial units?
 </p>
 </li>
 </ol></div>
@@ -1734,16 +1752,14 @@ the time units (seconds, minutes or minutes:seconds), as well as the unit system
 (metric or imperial). Selecting the appropriate options among these is critical for
 the successful import of the data.</p></div>
 <div class="paragraph"><p>The last remaining task is to ensure that all the data columns have the appropriate
-column headings. The top line of the white part of the data table contains the column
-headings found in the <em>CSV</em> data file. The blue row of cells immediately above these
-contains the names understood by <em>Subsurface</em>. The white area below the dropdown
-lists contains all the field names that <em>Subsurface</em> recognises. These names are
-in blue balloons and can be moved using a drag-and-drop action. For
+column headings. The top blue row of the data table contains the column
+headings found in the <em>CSV</em> data file. The blue row of balloons immediately above these
+contains the names understood by <em>Subsurface</em>. These balloons can be moved using a drag-and-drop action. For
 instance, <em>Subsurface</em> expects the column heading for Dive number (" # ") to be "Dive # ". If
-the column heading that <em>Subsurface</em> expects is not in the blue cells, then drag the
-appropriate column heading from the upper area and drop it in the appropriate blue
+the column heading that <em>Subsurface</em> expects is not in the blue row, then drag the
+appropriate balloon from the upper area and drop it in the appropriate blue
 cell at the top of the table. To indicate the correct column for "Dive #", drag
-the ballooned item labeled "Dive # " and drop it in the blue
+the ballooned item labelled "Dive # " and drop it in the blue
 cell immediately above the white cell containing " # ". This is depicted in
 the image below.</p></div>
 <div class="imageblock" style="text-align:center;">
@@ -1753,7 +1769,7 @@ the image below.</p></div>
 </div>
 <div class="paragraph"><p>Continue in this way to ensure that all the column headings in the blue row of
 cells correspond to the headings listed in the top part of the dialogue. Having
-completed this task, select the <em>OK</em> button to the bottom right og the dialogue.
+completed this task, select the <em>OK</em> button to the bottom right of the dialogue.
 The data from the <em>CSV</em> file are imported and shown in the <strong>Dive List</strong> panel.</p></div>
 <div class="sidebarblock" id="S_CSV_Intro">
 <div class="content">
@@ -1792,7 +1808,7 @@ Key Largo,2012-11-24,09:12,34:15,20.4,Jason McDonald
 Wismar Baltic,2012-12-01,10:13,35:27,15.4,Dieter Albrecht
 Pulau Weh,2012-12-20,09:46,55:56,38.6,Karaeng Bontonompo</code></pre>
 </div></div>
-<div class="paragraph"><p>In this format the data are not easily read by a human. Here is the same information in TAB-delimited format:</p></div>
+<div class="paragraph"><p>The above data are not easily read by a human. Here is the same information in TAB-delimited format:</p></div>
 <div class="literalblock">
 <div class="content">
 <pre><code>Dive site       Dive date       Time    Dive_duration   Dive_depth      Dive buddy
@@ -1838,7 +1854,7 @@ of the numbers or text within a cell. The
 file should use UTF-8 character set, if using non-ASCII characters. Also the
 size of the <em>CSV</em> file might cause problems. Importing 100 dives at a time
 (<em>CSV dive details</em>) works, but larger files might exceed
-limits of the parser used. When encountering problems with <em>CSV</em> imports, first try with
+the limits of the parser used. When encountering problems with <em>CSV</em> imports, first try with
 a smaller file to make sure everything works.</td>
 </tr></table>
 </div>
@@ -1847,12 +1863,12 @@ a smaller file to make sure everything works.</td>
 </div>
 <div class="sect2">
 <h3 id="S_Companion">5.4. Importing GPS coordinates with the <em>Subsurface Companion App</em> for mobile phones</h3>
-<div class="paragraph"><p>Using the <strong>Subsurface Companion App</strong> on an <em>Android device</em> with a GPS or
-<a href="#S_iphone"><em>iPhone</em></a>, the coordinates
+<div class="paragraph"><p>Using the <strong>Subsurface Companion App</strong> on an <em>Android device</em>   or
+<a href="#S_iphone"><em>iPhone</em></a> with GPS, the coordinates
 for the diving
 location can be automatically passed to the <em>Subsurface</em>
 dive log. The Companion App stores the dive locations on
-a dedicated Internet-based file server. <em>Subsurface</em>, in turn, can collect
+a dedicated Internet file server. <em>Subsurface</em>, in turn, can collect
 the localities from the file server.</p></div>
 <div class="paragraph"><p>To do this:</p></div>
 <div class="sect3">
@@ -1978,7 +1994,7 @@ panel opens (see <strong>C</strong> below) where the dive description or other d
 <img src="images/Companion_4.jpg" alt="FIGURE: Companion App, add location using map" />
 </div>
 </div>
-<div class="paragraph"><p>When one clicks on a dive (<strong>not</strong> selecting the check box), the
+<div class="paragraph"><p>When one selects a dive (<strong>not</strong> selecting the check box), the
 name given to it, date/time and GPS coordinates will be shown, with two options at the top
 of the screen:</p></div>
 <div class="ulist"><ul>
@@ -2020,7 +2036,7 @@ it deletes the selected dive location(s).</td>
 downloaded to a <em>Subsurface</em> dive log (see below).</p></div>
 </div>
 <div class="sect4">
-<h5 id="_settings_on_the_companion_app">Settings on the Companion app</h5>
+<h5 id="_settings_on_the_companion_app">Settings on the Companion App</h5>
 <div class="paragraph"><p>Selecting the <em>Settings</em> menu option results in the right hand image above (<strong>B</strong>).</p></div>
 </div>
 <div class="sect4">
@@ -2045,7 +2061,7 @@ downloaded to a <em>Subsurface</em> dive log (see below).</p></div>
 <div class="ulist"><ul>
 <li>
 <p>
-<em>Synchronize on startup.</em> If selected, dive locations in the Android device and those
+<em>Synchronize on startup</em>. If selected, dive locations in the Android device and those
   on the web service synchronise each time the app is started.
 </p>
 </li>
@@ -2087,7 +2103,7 @@ in the background of their Android device, allowing the continuous collection of
 </td>
 <td class="content"><em>How does the background service work?</em> Assuming the user sets 5 minutes and 50
 meters in the settings above, the app will start by recording a location at the current
-location, followed by another one at every 5 minutes <strong>or</strong> every time one moves 50m
+location, followed by another one at every 5 minutes <strong>or</strong> every time one moves 50 m
 from previous location.
 If subsequent locations are within a radius of 50 meters from the previous one,
 a new location is not saved. If the user is not moving, only one location is saved,
@@ -2156,7 +2172,7 @@ bar to end the location service. While the location
 service is running one can only add dives using the manual mechanism.</p></div>
 <div class="paragraph"><p>One can edit the site name afterwards by selecting the dive
 from the dive list and clicking on the site name. There are no other
-editable fields. The dive list is automatically uploaded from the iphone
+editable fields. The dive list is automatically uploaded from the iPhone
 to the webservice and there is not an option to
 trigger upload manually.</p></div>
 </div>
@@ -2244,17 +2260,23 @@ to be loaded into <em>Subsurface</em> and click the <em>Open</em> button.</p></d
 <img src="images/LoadImage2_f20.jpg" alt="FIGURE: Load images option" />
 </div>
 </div>
-<div class="paragraph"><p>This brings one to the time synchronisation dialog, shown below. The
+<div class="paragraph"><p>This brings up the time synchronisation dialog, shown below. The
 critical problem is that the time
 synchronisation is not perfect between the dive computer used during a dive,
 and the camera used during that same dive. These two devices
 often differ by several minutes. If <em>Subsurface</em> can achieve synchronisation,
 then the exact times of photographs can be used to position photographs on
 the dive profile.</p></div>
-<div class="paragraph"><p><em>Subsurface</em> achieves this synchronisation in two ways:</p></div>
+<div class="paragraph"><p><em>Subsurface</em> achieves this synchronisation in three ways:</p></div>
 <div class="ulist"><ul>
 <li>
 <p>
+<strong>Pro-actively</strong>: Before the dive, ensure synchronisation of the dive computer time settings with
+  the time settings of the camera by changing the date-time settings on one or both of these devices.
+</p>
+</li>
+<li>
+<p>
 <strong>Manually</strong>: If the user wrote down the exact camera time at the start of a dive, the
   difference in time between the two devices can be determined. Actually, as long as the device
   settings for time has not been changed in either device, one could write down the times of
@@ -2280,47 +2302,48 @@ the dive profile.</p></div>
 <strong>By photograph</strong>: There is a very slick way of achieving synchronisation. If one takes a
   photograph of the face of the dive computer showing the time, then <em>Subsurface</em> can obtain
   the exact time the photograph was taken, using the metadata that the camera stores within
-  each photo. In order to do this, use the bottom half of the Time shift_ dialog. If one uses
+  each photo. In order to do this, use the bottom half of the <em>Time shift</em> dialog. If one uses
   the bottom part, the top part of the dialog is ignored. Click on
-  the horizontal bar entitled "<em>Select image of divecomputer showing time</em>. This brings up
-  a file browser with which one can select the photograph of the dive computer. Select the
+  the horizontal bar entitled "<em>Select image of dive computer showing time</em>. This brings up
+  a file browser with which one can select the photograph of the dive computer time. Select the
   photograph using the file browser and click on <em>OK</em>. This photograph of the dive computer
   appears in the bottom panel of the <em>Shift times</em> dialog. Now <em>Subsurface</em> knows exactly
   when the photograph has been taken. Now set the date-time dialog to the left of the photo
   so that this tool reflects the date and time of the dive computer in the photo. When the
   date-time tool has been set, <em>Subsurface</em> knows exactly what the time difference between
-  camera and dive computer is, and synchronisation is achieved. There is a
-  photograph with the face of the dive computer and with the date-time tool set to the
-  date-time on image <strong>B</strong> above.
+  camera and dive computer is, and synchronisation is achieved.
+  Image <strong>B</strong> above shows a photograph of the face of the dive computer and with the date-time tool set to the
+  date-time.
 </p>
 </li>
 </ul></div>
-<div class="paragraph"><p>If the timestamp of a photograph is long before or after the dive, it is not placed on
-the dive profile. If the timestamp of the photo is within 30 minutes of the dive, it is shown.</p></div>
+<div class="paragraph"><p>If the timestamp of a photograph is more than 30 minutes before or after the dive, it is not placed on
+the dive profile.</p></div>
 </div>
 <div class="sect3">
 <h4 id="_viewing_the_photos">5.5.2. Viewing the photos</h4>
-<div class="paragraph"><p>In order to view the photos added to a dive, activate the <em>show-photos</em> button in the tool bar
-to the left of the dive profile:</p></div>
-<div class="imageblock" style="text-align:left;">
-<div class="content">
-<img src="images/icons/ShowPhotos_f20.png" alt="FIGURE:Show photos toolbar button" />
-</div>
-</div>
 <div class="paragraph"><p>After the images have been loaded, they appear in two places:</p></div>
 <div class="ulist"><ul>
 <li>
 <p>
-the <em>Photos</em> tab of the <strong>Dive Notes</strong> panel.
+the <em>Photos</em> tab of the <strong>Notes</strong> panel.
 </p>
 </li>
 <li>
 <p>
 as tiny icons (stubs) on the dive profile at the appropriate positions reflecting the time
-   each photograph was taken. See below:
+   each photograph was taken.
+   In order to view the photos on the dive profile, activate the <em>show-photos</em> button in the tool bar
+   to the left of the dive profile:
 </p>
 </li>
 </ul></div>
+<div class="imageblock" style="text-align:left;">
+<div class="content">
+<img src="images/icons/ShowPhotos_f20.png" alt="FIGURE:Show photos toolbar button" />
+</div>
+</div>
+<div class="paragraph"><p>This results in a profile display as in the image below:</p></div>
 <div class="imageblock" style="text-align:center;">
 <div class="content">
 <img src="images/LoadImage4_f20.jpg" alt="FIGURE: Photos on dive profile" />
@@ -2348,7 +2371,7 @@ can also be deleted using the <em>Photos</em> tab (see text below).</p></div>
 </div>
 <div class="sect3">
 <h4 id="_the_em_photos_em_tab">5.5.3. The <em>Photos</em> tab</h4>
-<div class="paragraph"><p>Photographs associated with a dive are shown as thumbnails in the <em>Photos</em> tab of the <em>Dive Notes</em>
+<div class="paragraph"><p>Photographs associated with a dive are shown as thumbnails in the <em>Photos</em> tab of the <em>Notes</em>
 panel. Photos taken in rapid succession during a dive (therefore sometimes with large
 overlap on the dive profile) can easily be accessed in the <em>Photos</em> tab. This tab serves as
 a tool for individually accessing the photos of a dive, while the stubs on the dive profile
@@ -2360,7 +2383,7 @@ from the <em>Photos</em> tab as well as the dive profile.</p></div>
 </div>
 <div class="sect3">
 <h4 id="_photos_on_an_external_hard_disk">5.5.4. Photos on an external hard disk</h4>
-<div class="paragraph"><p>Most underwater photographers store their photos on an external drive. If such a drive can be mapped
+<div class="paragraph"><p>Most underwater photographers store their photos on an external drive. If such a drive can be mapped by the operating system
 (almost always the case) the photos can be directly accessed by <em>Subsurface</em>. This facilitates the interaction
 between <em>Subsurface</em> and an external repository of photos. When associating a dive profile with photos from an
 external drive, the normal procedure of selection and synchronisation (see text above) is used.
@@ -2370,21 +2393,76 @@ program only shows a small white dot where each photo should be on the dive prof
 In addition the <em>Photos</em> tab only shows the file names of the photos. This is normal behaviour.
 If, later, the external drive with the photos is connected again, the photos can be seen in the normal way.</p></div>
 </div>
+<div class="sect3">
+<h4 id="S_FindMovedImages">5.5.5. Moving photographs among directories, hard disks or computers</h4>
+<div class="paragraph"><p>After a photograph has been loaded into <em>Subsurface</em> and associated with a specific dive, the directory
+ where the photo lies is stored, allowing <em>Subsurface</em> to find the photograph when the dive is
+ opened again. If the photo or the whole photo collection is moved to another drive or to a different
+ machine, it is unlikely that the directory structure will remain identical to that of the original uploaded
+ photo. When this happens, <em>Subsurface</em> looks for the photos at their original location before they were moved,
+ cannot find them and therefore cannot display them. Because, after moving photos, large numbers of photos
+ may need to be deleted and re-imported from the new location, <em>Subsurface</em> has a mechanism that eases the
+ process of updating the directory information for each photo: automatic updates using fingerprints.</p></div>
+<div class="paragraph"><p>When a photo is loaded into <em>Subsurface</em>, a fingerprint for the image is calculated and stored with the
+ other reference information for that photo. After moving a photo collection (that has already been loaded
+ into <em>Subsurface</em>) to a different directory, disk or computer, <em>Subsurface</em> can  perform the
+ following steps:</p></div>
+<div class="ulist"><ul>
+<li>
+<p>
+look through a particular directory (and all its subdirectories recursively) where photos have been moved
+ to,
+</p>
+</li>
+<li>
+<p>
+calculate fingerprints for all photos in this directory, and
+</p>
+</li>
+<li>
+<p>
+if there is a match between a calculated fingerprint and the one originally calculated when a photo was
+ loaded into <em>Subsurface</em> (even if the original file name has changed), to automatically update the
+ directory information so that <em>Subsurface</em> can find the photo in the new moved directory.
+</p>
+</li>
+</ul></div>
+<div class="paragraph"><p>This is achieved by selecting from the Main Menu: <em>File &#8594;      Find moved images</em>. This brings up a window within
+ which the NEW directory of the photos needs to be specified. Select the appropriate directory and click
+ the <em>Scan</em> button towards the bottom right of the panel. The process may require several minutes to
+ complete, after which <em>Subsurface</em> will show the appropriate photographs when a particular dive is opened.</p></div>
+<div class="sidebarblock" id="Image_fingerprint_upgrade">
+<div class="content">
+<div class="paragraph"><p><strong>Upgrading existing photo collections without fingerprints</strong></p></div>
+<div class="admonitionblock">
+<table><tr>
+<td class="icon">
+<img src="images/icons/important.png" alt="Important" />
+</td>
+<td class="content"><em>Subsurface</em> automatically calculates fingerprints for all images that can be accessed by <em>Subsurface</em>.
+When manipulating images, ensure that all the images associated with the dive log can be accessed by <em>Subsurface</em>.</td>
+</tr></table>
+</div>
+<div class="paragraph"><p><em>Subsurface</em> automatically checks and, if necessary, updates the fingerprints associated with a single dive if:
+- The images associated with that dive are visible as thumbnails on the <strong>Dive Profile</strong>.
+- One edits anything in the <strong>Notes tab</strong> panel and save the edits by selecting <em>Apply changes</em>.</p></div>
+</div></div>
+</div>
 </div>
 <div class="sect2">
 <h3 id="_logging_special_types_of_dives">5.6. Logging special types of dives</h3>
 <div class="sect3">
 <h4 id="S_MulticylinderDives">5.6.1. Multicylinder dives</h4>
-<div class="paragraph"><p><em>Subsurface</em> easily handles dives involving more than one cylinder. Multicylinder diving usually happens
+<div class="paragraph"><p><em>Subsurface</em> easily handles dives involving more than one cylinder. Multi-cylinder diving usually happens
 (a) if a diver does not have enough gas for the complete dive in a single cylinder; (b) if the diver
 needs more than one gas mixture because of the depth or the decompression needs of the dive. For this reason
-multicylinder dives are often used by technical divers who dive deep or long. As far
+multi-cylinder dives are often used by technical divers who dive deep or long. As far
 as <em>Subsurface</em> is concerned, there are only two types of information that need to be provided:</p></div>
 <div class="ulist"><ul>
 <li>
 <p>
 <strong>Describe the cylinders used during the dive</strong> This is performed in the <strong>Equipment tab</strong> of
-  the <strong>Dive Info</strong> panel, as <a href="#cylinder_definitions">described above</a>. Enter the cylinders one by one,
+  the <strong>Info</strong> panel, as <a href="#cylinder_definitions">described above</a>. Enter the cylinders one by one,
   specifying the characteristics of the cylinder and the gas composition within each cylinder.
 </p>
 </li>
@@ -2419,27 +2497,27 @@ to perform decompression.</p></div>
 </div>
 <div class="sect3">
 <h4 id="_sidemount_dives">5.6.2. Sidemount dives</h4>
-<div class="paragraph"><p>Sidemount diving is just another form of multicylinder diving, often with both or all cylinders having
+<div class="paragraph"><p>Sidemount diving is just another form of multi-cylinder diving, often with both or all cylinders having
 the same gas mixture. Although it is a popular configuration for cave divers, sidemount
 diving can be performed by recreational divers who have completed the appropriate training. Sidemount
-dive logging involves, exactly as with multicylinder dives, above, three steps:</p></div>
+dive logging involves, exactly as with multi-cylinder dives, above, three steps:</p></div>
 <div class="ulist"><ul>
 <li>
 <p>
 <strong>During the dive, record cylinder switch events</strong>. Since sidemount diving normally involves two
   cylinders with air or with the same gas mixture, <em>Subsurface</em> distinguishes among these different
-  cylinders. In contrast, most dive computers that allow gas switching only distinguish among different
+  cylinders. In contrast, many dive computers that allow gas switching only distinguish among different
   <em>gases</em> used, not among different <em>cylinders</em> used. This means that when sidemount dives are downloaded
   from these dive computers, the events of switching between cylinders with the same gas are not downloaded. This may mean
   that one may have to keep a written log of cylinder switch times using a slate, or (if the dive computer
   has this facility) marking each cylinder switch with a bookmark that can be retrieved later. Returning
-  from a dive with the information about cylinder changes is the only tricky part of logging sidemount dives.
+  from a dive with the times of cylinder changes is the only tricky part of logging sidemount dives.
 </p>
 </li>
 <li>
 <p>
 <strong>Within <em>Subsurface</em> describe the cylinders used during the dive</strong>. The diver needs to provide the
-  specifications of the different cylinders, using the <strong>Equipment</strong> tab of the <strong>Dive Info Panel</strong> (see
+  specifications of the different cylinders, using the <strong>Equipment</strong> tab of the <strong>Info Panel</strong> (see
   image below where two 12 litre cylinder were used).
 </p>
 </li>
@@ -2486,7 +2564,7 @@ breathing gas is released continuously from the back cylinder.</td>
 <div class="ulist"><ul>
 <li>
 <p>
-Select pSCR in the <em>Dive Mode</em> dropdown list on the <strong>Dive Info</strong> panel.
+Select pSCR in the <em>Dive Mode</em> dropdown list on the <strong>Info</strong> panel.
 </p>
 </li>
 <li>
@@ -2519,14 +2597,14 @@ gas that has been breathed while doing two things to maintain a
 breathable oxygen concentration:
 a) remove carbon dioxide from the gas that has been exhaled
 b) regulate the oxygen concentration to remain within safe diving limits.
-Currently, within <em>Subsurface</em>, the Poseidon MkVI Discovery is the best
-supported CCR dive computer. The CCR interface of <em>Subsurface</em> is currently experimental
-and under active development. In contrast to a conventional recreational
+The CCR interface of <em>Subsurface</em> is currently experimental
+and under active development. Subsurface currently supports Poseidon MkVI
+and APD Discovery/Evolution dive computers. In contrast to a conventional recreational
 dive computer, a CCR system computer does not allow the download of a log
 containing multiple dives. Rather, each dive is stored independently. This
 means that <em>Subsurface</em> cannot download a dive log directly from a CCR
 dive computer, but that it imports CCR dive logs in the same way that it
-imports dive log data from other digital databases.</td>
+imports dive log data from other digital databases: one dive at a time.</td>
 </tr></table>
 </div>
 <div class="sect4">
@@ -2535,13 +2613,14 @@ imports dive log data from other digital databases.</td>
 digital sources</a>. From the main menu of <em>Subsurface</em>, select <em>Import &#8594;  Import
 log files</em> to bring up the <a href="#Unified_import">universal import dialogue</a>. As
 explained in that section, the bottom right
-hand of the import dialogue contains a dropdown list of appropriate devices
-that currently includes an option for (Poseidon) MkVI files (import for other
-CCR equipment is under active development). Having selected  the appropriate CCR format and
+hand of the import dialogue contains a dropdown list (labled <em>Filter:</em>) of appropriate devices
+that currently includes(Poseidon) MkVI or APD log viewer files (import for other
+CCR equipment is under active development). Having selected the appropriate CCR format and
 the directory where the original dive logs have been stored from the CCR dive
 computer, one can select a particular dive log file (in the case of the MkVI
 it is a file with a .txt extension). After selecting the appropriate dive log,
-activate the <em>Open</em> button at the bottom right hand of the universal import dialogue.</p></div>
+activate the <em>Open</em> button at the bottom right hand of the universal import dialogue.
+The selected dive is imported to the <em>Subsurface</em> dive list.</p></div>
 </div>
 <div class="sect4">
 <h5 id="_displayed_information_for_a_ccr_dive">Displayed information for a CCR dive</h5>
@@ -2568,7 +2647,7 @@ For THREE-sensor systems (e.g. APD), the mean value is also used. However
 </li>
 <li>
 <p>
-If no sensor data is available, the pO<sub>2</sub> value is assumed to be equal to the setpoint.
+If no sensor data are available, the pO<sub>2</sub> value is assumed to be equal to the setpoint.
 </p>
 </li>
 </ul></div>
@@ -2577,7 +2656,7 @@ If no sensor data is available, the pO<sub>2</sub> value is assumed to be equal
 oxygen sensors can be shown. The display of additional CCR information is turned on by
 checking the appropriate checkboxes in the <em>Preferences</em> panel (accessible by
 selecting <a href="#S_CCR_options"><em>File &#8594;  Preferences &#8594;  Graph</em></a>). This part of
-the <em>Preferences</em> panel look like this, representing two checkboxes that modify
+the <em>Preferences</em> panel is shown in the image below, representing two checkboxes that modify
 the display of pO<sub>2</sub> when the appropriate toolbar button on the Dive Profile
 has been activated.</p></div>
 <div class="imageblock" style="text-align:center;">
@@ -2585,11 +2664,11 @@ has been activated.</p></div>
 <img src="images/CCR_preferences_f20.jpg" alt="FIGURE: CCR preferences panel" />
 </div>
 </div>
-<div class="paragraph"><p>Checking any of the check boxes allows the display of additional oxygen-related
+<div class="paragraph"><p>Checking any of these check boxes allows the display of additional oxygen-related
 information whenever the pO<sub>2</sub> toolbar button on the <em>Profile</em> panel is activated.
 The first checkbox allows the display of setpoint information. This is a red line
 superimposed on the green oxygen partial pressure graph and allows a comparison of the
-mean measured oxygen partial pressure and the setpoint values, as in the image below.</p></div>
+mean measured oxygen partial pressure and the setpoint values, as shown below.</p></div>
 <div class="imageblock" style="text-align:center;">
 <div class="content">
 <img src="images/CCR_setpoint_f20.jpg" alt="FIGURE: CCR setpoint and po2 graph" />
@@ -2637,14 +2716,32 @@ of setpoint and oxygen sensor data, as well as the cylinder pressure data. In th
 case there is good agreement from the readings of the two oxygen sensors.</p></div>
 <div class="imageblock" style="text-align:center;">
 <div class="content">
-<img src="images/CCR_dive_profile_f20.jpg" alt="FIGURE: CCR dive profile" />
+<img src="images/CCR_dive_profile_f22.jpg" alt="FIGURE: CCR dive profile" />
 </div>
 </div>
 <div class="paragraph"><p><em>Equipment-specific information</em>: Equipment-specific information gathered by
 <em>Subsurface</em> is shown in the <a href="#S_ExtraDataTab">Extra data tab</a>. This may include setup information
 or metadata about the dive.</p></div>
+<div class="paragraph"><p>The deco ceiling calculated by Subsurface is not very accurate because the precise pressure of nitrogen
+in the loop can usually not be determined from the dive log imported from the CCR equipment. Many CCR dive
+computers, however, report an internally-calculated deco ceiling that is reported in the dive log,
+reflecting a more accurate assessment. The display of this ceiling is activated
+by clicking the appropriate button to the left of the dive profile:</p></div>
+<div class="imageblock">
+<div class="content">
+<img src="images/icons/cceiling.jpg" alt="DC ceiling icon" />
+</div>
+</div>
+<div class="paragraph"><p>The default colour of the computer-generated deco ceiling is white. However, this can be set to red
+by checking the appropriate check box after selecting <em>File  &#8594;  Preferences  &#8594;  Graph</em>.
+Below is a dive profile indicating the dive computer-generated deco ceiling:</p></div>
+<div class="imageblock" style="text-align:center;">
+<div class="content">
+<img src="images/CCR_dive_ceilingF22.jpg" alt="FIGURE: CCR computer-generated deco ceiling" />
+</div>
+</div>
 <div class="paragraph"><p>More equipment-specific information for downloading CCR dive logs for
-Poseidon MkVI and APD equipment can be found in <a href="#S_PoseidonMkVI">Appendix B</a>.</p></div>
+Poseidon MkVI and APD equipment can be found in <a href="#_appendix_b_dive_computer_specific_information_for_importing_dive_information">Appendix B</a>.</p></div>
 </div>
 </div>
 </div>
@@ -2654,8 +2751,8 @@ Poseidon MkVI and APD equipment can be found in <a href="#S_PoseidonMkVI">Append
 <h2 id="_obtaining_more_information_about_dives_entered_into_the_logbook">6. Obtaining more information about dives entered into the logbook</h2>
 <div class="sectionbody">
 <div class="sect2">
-<h3 id="_the_strong_dive_info_strong_tab_for_individual_dives">6.1. The <strong>Dive Info</strong> tab (for individual dives)</h3>
-<div class="paragraph"><p>The Dive Info tab gives some summary information about a particular dive that
+<h3 id="_the_strong_info_strong_tab_for_individual_dives">6.1. The <strong>Info</strong> tab (for individual dives)</h3>
+<div class="paragraph"><p>The Info tab gives some summary information about a particular dive that
 has been selected in the <strong>Dive List</strong>. Useful information here includes the
 surface interval before the dive, the maximum and mean depths of the dive, the
 gas volume consumed, the surface air consumption (SAC) and the number of oxygen
@@ -2772,7 +2869,7 @@ frequently increases the size of the dive profile to fill the area of the panel
 <div class="paragraph"><p><strong>Water temperature</strong> is displayed with its own blue line with temperature values
 placed adjacent to significant changes.</p></div>
 <div class="paragraph"><p>The dive profile can include graphs of the <strong>partial pressures</strong>
-of O2, N2, and He during the dive (see figure above) as well as a calculated and dive computer
+of O<sub>2</sub>, N<sub>2</sub>, and He during the dive (see figure above) as well as a calculated and dive computer
 reported deco ceilings (only visible for deep, long, or repetitive dives).
 Partial pressures of oxygen are indicated in green, those of nitrogen in black,
 and those of helium in dark red. These
@@ -2959,7 +3056,7 @@ The black line, graphed above the ambient pressure, is the maximum allowable tis
 from the gradient factors specified in the <strong>Preferences</strong>. For
 divers involved in planned decompression diving, efficient rates of offgasing are obtained with tissue pressures
 between the ambient inert gas pressure (grey line) and the pressure limit (black line). This display is a representation
-of the tissue pressures during the whole dive. In contast, the <a href="#S_gas_pressure_graph">Gas Pressure Graph</a> in the <strong>Information Box</strong> on the <strong>Dive Profile</strong>
+of the tissue pressures during the whole dive. In contrast, the <a href="#S_gas_pressure_graph">Gas Pressure Graph</a> in the <strong>Information Box</strong> on the <strong>Dive Profile</strong>
 is an instantaneous reflection of tissue pressures at the moment in time reflected by the position of the cursor on the dive profile.</td>
 </tr></table>
 </div>
@@ -2996,7 +3093,7 @@ imported from a Dive Computer. Markers are placed against the depth profile line
 and with the time of the event set by where the mouse cursor was when the right
 mouse button was initially clicked to bring up the menu. Gas Change events
 involve a selection of which gas is being switched to, the list of choices being based on
-the available gases defined in the Equipment Tab. Set-point change
+the available gases defined in the <strong>Equipment</strong> Tab. Set-point change
 events open a dialog allowing to choose the next set-point value. As
 in the planner, a set-point value of zero indicates the diver is
 breathing from an open circuit system while any non-zero value
@@ -3046,7 +3143,9 @@ buttons on the left of the profile panel. These are:</p></div>
 <td class="content">Clicking this button causes the Information Box to display the <strong>Maximum Operating Depth
 (MOD)</strong> of the dive, given the
 gas mixture used. MOD is dependent on the oxygen concentration in the breathing gas.
-For air (21% oxygen) it is around 57 m. Below the MOD there is a markedly increased
+For air (21% oxygen) it is around 57 m if a maximum pO<sub>2</sub> of 1.4 is specified in the <strong>Preferences</strong> section
+(select <em>File</em> &#8594; Preferences &#8594; Graph_ and edit the text box <em>Max pO<sub>2</sub> when showing MOD</em>.
+Below the MOD there is a markedly increased
 risk of exposure to the dangers associated with oxygen toxicity.</td>
 </tr></table>
 </div>
@@ -3091,11 +3190,11 @@ values are dependent on the composition of the breathing gas.  The EAD
 is the depth of a hypothetical air dive that has the same partial
 pressure of nitrogen as the current depth of the nitrox dive at
 hand. A nitrox dive leads to the same decompression obligation as an
-air dive to the depth equaling the EAD. The END is the depth of a
+air dive to the depth equalling the EAD. The END is the depth of a
 hypothetical air dive that has the same sum of partial pressures of
 the narcotic gases nitrogen and oxygen as the current trimix dive. A
 trimix diver can expect the same narcotic effect as a diver breathing
-air diving at a depth equaling the END.</td>
+air diving at a depth equalling the END.</td>
 </tr></table>
 </div>
 <div class="paragraph"><p>Figure (<strong>B</strong>) above shows an information box with a nearly complete set of data.</p></div>
@@ -3139,8 +3238,8 @@ The dark green area at the bottom of the graph represents the pressures of inert
 <li>
 <p>
 The top black horizontal line indicates the gradient factor that applies to the depth of
-  the diver at the particular point on the <strong>Dive Profile</strong>. The appropriate gradient factor is an
-  interpolation between the FGLow and GFHigh values specified in the Graph tab of the <strong>Preferences
+  the diver at the particular point on the <strong>Dive Profile</strong>. The gradient factor shown is an
+  interpolation between the GFLow and GFHigh values specified in the Graph tab of the <strong>Preferences
   Panel</strong> of <strong>Subsurface</strong>.
 </p>
 </li>
@@ -3202,9 +3301,8 @@ Graph <strong>E</strong> indicates the situation after remaining at 4.5 meters f
 <div class="sectionbody">
 <div class="sect2">
 <h3 id="_the_dive_list_context_menu">7.1. The Dive List context menu</h3>
-<div class="paragraph"><p>Many actions within <em>Subsurface</em> are dependent on a context menu used
-mostly to manipulate  groups of dives. The context menu is found by selecting
-a dive or a group of dives and then right-clicking.</p></div>
+<div class="paragraph"><p>Several actions on either a single dive or a group of dives can be performed using the Dive List
+Context Menu, found by selecting either a single dive or a group of dives and then right-clicking.</p></div>
 <div class="imageblock" style="text-align:center;">
 <div class="content">
 <img src="images/ContextMenu.jpg" alt="Figure: Context Menu" />
@@ -3212,7 +3310,7 @@ a dive or a group of dives and then right-clicking.</p></div>
 </div>
 <div class="paragraph"><p>The context menu is used in many manipulations described below.</p></div>
 <div class="sect3">
-<h4 id="_customising_the_information_showed_in_the_strong_dive_list_strong_panel">7.1.1. Customising the information showed in the <strong>Dive List</strong> panel</h4>
+<h4 id="_customising_the_columns_showed_in_the_strong_dive_list_strong_panel">7.1.1. Customising the columns showed in the <strong>Dive List</strong> panel</h4>
 <div class="imageblock" style="text-align:center;">
 <div class="content">
 <img src="images/DiveListOptions.jpg" alt="Example: Dive list info options" />
@@ -3222,15 +3320,8 @@ a dive or a group of dives and then right-clicking.</p></div>
 Dive_duration and Dive_location. This information can be controlled and changed by right-clicking on the
 header bar of the <strong>Dive List</strong>. For instance, a right-click on the <em>Date</em> header brings up a list of items
 that can be shown in the dive list (see above). Select an item to be shown in the <strong>Dive List</strong> or to be
-deleted from the dive list, and the list is immediately updated accordingly. Preferences for information
-shown in the <strong>Dive List</strong> is saved and used when <em>Subsurface</em> is re-opened.</p></div>
-</div>
-<div class="sect3">
-<h4 id="_selecting_dives_from_a_particular_dive_site">7.1.2. Selecting dives from a particular dive site</h4>
-<div class="paragraph"><p>Many divers have long dive lists and it may be difficult to locate all the dives at a particular site.
-By pressing <em>Ctl-F</em> on the keyboard, a text box is opened at the top left hand of the <strong>Dive List</strong>.
-Type the name of a dive site in this text box and the <strong>Dive List</strong> is immediately filtered to
-show only the dives for that site.</p></div>
+deleted from the dive list (reflected by the check symbols) and the list is immediately updated. Preferences for information
+shown in the <strong>Dive List</strong> are saved and used when <em>Subsurface</em> is re-opened.</p></div>
 </div>
 </div>
 <div class="sect2">
@@ -3245,12 +3336,16 @@ This is performed by selecting (from the Main Menu) <em>Log &#8594;  Renumber</e
 given a choice with respect to the lowest sequence number to be used.
 Completing this operation results in new sequence numbers (based on date/time)
 for the dives in the <strong>Dive List</strong> panel.</p></div>
+<div class="paragraph"><p>One can also renumber a few selected dives in the dive list. Select the dives that
+need renumbering. Right-click on the selected list and use the Dive List Context Menu
+to perform the renumbering. A popup window appears requiring the user to specify
+the starting number for the renumbering process.</p></div>
 </div>
 <div class="sect2">
 <h3 id="S_Group">7.3. Grouping dives into trips and manipulating trips</h3>
 <div class="paragraph"><p>For regular divers, the dive list can rapidly become very long. <em>Subsurface</em>
 can group dives into <em>trips</em>. It performs this by grouping dives that have
-date/times that are not separated in time by more than two days, thus creating
+date/times not separated in time by more than two days, thus creating
 a single heading for each diving trip represented in the dive log. Below is an
 ungrouped dive list (<strong>A</strong>, on the left) as well as the corresponding grouped dive
 list comprising five dive trips (<strong>B</strong>, on the right):</p></div>
@@ -3261,20 +3356,20 @@ list comprising five dive trips (<strong>B</strong>, on the right):</p></div>
 </div>
 <div class="paragraph"><p>Grouping into trips allows a rapid way of accessing individual dives without
 having to scan a long lists of dives. In order to group the dives in a dive list,
-(from the Main Menu) users must select <em>Log &#8594;  Autogroup</em>. The <strong>Dive List</strong> panel
+(from the Main Menu) select <em>Log &#8594;  Autogroup</em>. The <strong>Dive List</strong> panel
 now shows only the titles for the trips.</p></div>
 <div class="sect3">
 <h4 id="_editing_the_title_and_associated_information_for_a_particular_trip">7.3.1. Editing the title and associated information for a particular trip</h4>
 <div class="paragraph"><p>Normally, in the dive list, minimal information is included in the trip title.
 More information about a trip can be added by selecting its trip title from
-the <strong>Dive List</strong>. This shows a <strong>Trip Notes</strong> tab in the <strong>Dive Notes</strong> panel. Here
-users can add or edit information about the date/time, the trip location and any
+the <strong>Dive List</strong>. This shows a <strong>Trip Notes</strong> tab in the <strong>Notes</strong> panel. Here
+one can add or edit information about the date/time, the trip location and any
 other general comments about the trip as a whole (e.g. the dive company that was
 dived with, the general weather and surface conditions during the trip, etc.).
 After entering this
-information, users should select <strong>Save</strong> from the buttons at the top right
+information, select <strong>Save</strong> from the buttons at the top right
 of the <strong>Trip Notes</strong>
-tab. The trip title in the <strong>Dive List</strong> panel should now reflect some of the
+tab. The trip title in the <strong>Dive List</strong> panel should now reflect the
 edited information.</p></div>
 </div>
 <div class="sect3">
@@ -3285,23 +3380,22 @@ the selected trip, revealing the individual dives performed during the trip.</p>
 </div>
 <div class="sect3">
 <h4 id="_collapsing_or_expanding_dive_information_for_different_trips">7.3.3. Collapsing or expanding dive information for different trips</h4>
-<div class="paragraph"><p>If a user right-clicks after selecting a particular trip in the dive list, the
-resulting context menu allows several possibilities to expand or collapse dives
-within trips. This includes expanding all trips, collapsing all trips and
-collapsing all trips except the selected one.</p></div>
+<div class="paragraph"><p>After selecting a particular trip in the dive list, the
+context menu allows several possibilities to expand or collapse dives
+within trips. This includes expanding all trips and collapsing all trips.</p></div>
 </div>
 <div class="sect3">
 <h4 id="_merging_dives_from_more_than_one_trip_into_a_single_trip">7.3.4. Merging dives from more than one trip into a single trip</h4>
-<div class="paragraph"><p>By right-clicking on a selected trip title in the <strong>Dive List</strong> panel, a
-context menu shows up that allows the merging of trips by either merging of the selected trip
-with the trip below or with the trip above.</p></div>
+<div class="paragraph"><p>After selecting a trip title, the context menu allows the merging
+of trips by either merging the selected trip with the trip below or with the
+trip above. (Merge trip with trip below; Merge trip with trip above)</p></div>
 </div>
 <div class="sect3">
 <h4 id="_splitting_a_single_trip_into_more_than_one_trip">7.3.5. Splitting a single trip into more than one trip</h4>
-<div class="paragraph"><p>If a trip includes five dives, the user can split this trip into two trips (trip 1:
-top 3 dives; trip 2: bottom 2 dives) by selecting and right-clicking the top
-three dives. The resulting context menu allows the user to create a new trip by
-choosing the option <strong>Create new trip above</strong>. The top three dives are then
+<div class="paragraph"><p>If a trip includes ten dives, the user can split this trip into two trips (trip 1:
+top 4 dives; trip 2: bottom 6 dives) by selecting and right-clicking the top
+four dives. The resulting context menu allows the user to create a new trip by
+choosing the option <strong>Create new trip above</strong>. The top four dives are then
 grouped
 into a separate trip. The figures below shows the selection and context menu
 on the left (A) and
@@ -3328,28 +3422,26 @@ calibration dives of the dive computer or dives of extremely short duration.</p>
 <div class="paragraph"><p>Users can unlink dives from the trip to which they belong. In order to do this,
 select and right-click
 the relevant dives to bring up the context menu. Then select the option <strong>Remove dive(s)
-from trip</strong>. The dive(s) now appear immediately above the trip to
-which they belonged.</p></div>
+from trip</strong>. The dive(s) now appear immediately above or below the trip to
+which they belonged, depending on the date and time of the unlinked dive.</p></div>
 </div>
 <div class="sect3">
 <h4 id="_add_a_dive_to_the_trip_immediately_above">7.4.3. Add a dive to the trip immediately above</h4>
 <div class="paragraph"><p>Selected dives can be moved from the trip to which they belong and placed within
-the trip immediately above the currently active trip. To do this, select
-and right-click
-the dive(s) to bring up the context menu, and then select <strong>Add dive(s) to trip
-immediately above</strong>.</p></div>
+a separate trip. To do this, select and right-click
+the dive(s) to bring up the context menu, and then select <strong>Create new trip above</strong>.</p></div>
 </div>
 <div class="sect3">
 <h4 id="_shift_the_start_time_of_dive_s">7.4.4. Shift the start time of dive(s)</h4>
 <div class="paragraph"><p>Sometimes it is necessary to adjust the start time of a dive. This may apply to
 situations where dives are performed in different time zones or when the dive
-computer has an erroneous time. In order to do this, user must select and right-click
+computer has an erroneous time. In order to do this, select and right-click
 the dive(s) to be
 adjusted. This action brings up the context menu on which the <strong>Shift times</strong>
 option should be selected. User must then specify the
 time
 (in hours and minutes) by which the dives should be adjusted and click on the
-option indicating whether the time adjustment should be forwards or backwards.</p></div>
+option indicating whether the time adjustment should be ealier or later.</p></div>
 </div>
 <div class="sect3">
 <h4 id="_merge_dives_into_a_single_dive">7.4.5. Merge dives into a single dive</h4>
@@ -3358,15 +3450,22 @@ for a few minutes, resulting in two or more dives being recorded by the dive
 computer and appearing as different dives in the <strong>Dive List</strong> panel. Users can
 merge these dives onto a single dive by selecting the appropriate dives,
 right-clicking them to bring up the context menu and then selecting <strong>Merge selected
-dives</strong>. It may be necessary to edit the dive information in the <strong>Dive Notes</strong>
+dives</strong>. It may be necessary to edit the dive information in the <strong>Notes</strong>
 panel to reflect events or conditions that apply to the merged dive. The figure
-below shows the depth profile of two such dives that were merged:</p></div>
+below shows the depth profile of two dives that were merged:</p></div>
 <div class="imageblock" style="text-align:center;">
 <div class="content">
 <img src="images/MergedDive.png" alt="Example: Merged dive" />
 </div>
 </div>
 </div>
+<div class="sect3">
+<h4 id="_undo_dive_manipulations">7.4.6. Undo dive manipulations</h4>
+<div class="paragraph"><p>Important actions on dives or trips, described above, can be undone or redone.
+This includes: <em>delete dives</em>, <em>merge dives</em>, <em>renumber dives</em> and <em>shift dive times</em>.
+To do this after performing any of these actions, from the <strong>Main Menu</strong> select
+<em>Edit</em>. This brings up the possibility to <em>Undo</em> or <em>Redo</em> an action.</p></div>
+</div>
 </div>
 <div class="sect2">
 <h3 id="S_Filter">7.5. Filtering the dive list</h3>
@@ -3376,12 +3475,11 @@ clothing. For instance, filtering allows one to list the deep dives at a particu
 dive site, or otherwise the cave dives with a particular buddy.</p></div>
 <div class="paragraph"><p>To open the filter, select <em>Log &#8594;  Filter divelist</em> from the main menu. This opens the
 <em>Filter Panel</em> at the top of the <em>Subsurface</em> window. Three icons are located at the top
-right hand of the filter panel. The <em>Filter Panel</em> can be reset
-(i.e. all current filters cleared) by selecting the <strong>+</strong>. The <em>Filter Panel</em> may also be
-minimised by selecting the middle icon. When minimised, only these three icons are shown.
+right hand of the filter panel (see image below). The <em>Filter Panel</em> can be reset
+(i.e. all current filters cleared) by selecting the <strong>yellow angled arrow</strong>. The <em>Filter Panel</em> may also be
+minimised by selecting the <strong>green up-arrow". When minimised, only these three icons are shown.
 The panel can be maximised by clicking the icon that minimised the panel. The filter may also be
-reset and closed by selecting the button with the flag.
-An example of the <em>Filter Panel</em> is shown in the figure below.</p></div>
+reset and closed by selecting the *red button</strong> with the white cross.</p></div>
 <div class="imageblock" style="text-align:center;">
 <div class="content">
 <img src="images/Filterpanel.jpg" alt="Figure: Filter panel" />
@@ -3394,13 +3492,13 @@ the attributes within that check list. For instance, typing "<em>ca</em>" in the
 textbox above the tags check list results in the tags check list being reduced
 to "<em>cave</em>" and "<em>cavern</em>". Filtering of the check list enables the rapid finding
 of search terms for filtering the dive list.</p></div>
-<div class="paragraph"><p>To activate filtering of the dive list, the check box of at least one item in one of
-the four check lists needs to be checked. The dive list is then shortened to include
-only the dives that pertain to the selection criteria specified in the check lists.
+<div class="paragraph"><p>To activate filtering of the dive list, check at least one check box in one of
+the four check lists. The dive list is then shortened to include
+only the dives that pertain to the criteria specified in the check lists.
 The four check lists work as a filter with <em>AND</em> operators, Subsurface
 filters therefore  for <em>cave</em> as a tag AND <em>Joe Smith</em> as a buddy; but the
 filters within a category are inclusive - filtering for <em>cave</em> and <em>boat</em>
-shows those dives that have either one or both of these tags.</p></div>
+shows those dives that have either one OR both of these tags.</p></div>
 </div>
 </div>
 </div>
@@ -3422,41 +3520,43 @@ Export dive information to <em>Facebook</em>
 </ul></div>
 <div class="sect2">
 <h3 id="S_facebook">8.1. Exporting dive information to <em>Facebook</em></h3>
-<div class="paragraph"><p>Export of dives to <em>Facebook</em> is handled differently from other types of export. This is because
-export to <em>Facebook</em> needs a connection to <em>Facebook</em>, requiring a <em>Facebook</em> userID and password.
-If, from the Main Menu, one selects <em>File &#8594;  Preferences &#8594;  Facebook</em>, a login screen is presented
-(see image <strong>A</strong> to the left, below).  Provide your <em>Facebook</em> userID and password.
-Once successful login to <em>Facebook</em> has been achieved, the panel
-in image <strong>B</strong>, below is presented. This panel has a button that needs to be selected in order to close the
+<div class="paragraph"><p>Export of dives to <em>Facebook</em> is handled differently from other types of export because
+a connection to <em>Facebook</em> is required, needing a <em>Facebook</em> userID and password.
+If, from the <strong>Main Menu</strong>, one selects <em>File &#8594;  Preferences &#8594;  Facebook</em>, a login screen is presented
+(image <strong>A</strong> to the left, below).  Provide a <em>Facebook</em> userID and password.
+Once a successful login to <em>Facebook</em> has been achieved, the panel
+in image <strong>B</strong>, below is presented, including a <em>Disconnect from Facebook</em> button to close the
 <em>Facebook</em> connection.</p></div>
 <div class="imageblock" style="text-align:center;">
 <div class="content">
 <img src="images/facebook1_f20.jpg" alt="Figure: Facebook login" />
 </div>
 </div>
+<div class="paragraph"><p>From the <em>Subsurface</em> window it is easy to determe whether <em>Subsurface</em> has a valid connection to <em>Facebook</em>
+From the <strong>Main Menu</strong>, select <em>Share on &#8594; Facebook</em> (image <strong>A</strong>, below). Normally, the <em>Facebook</em> option is greyed out. But
+if there is a connection to <em>Facebook</em>, this option is active (i.e. in black colour and can be selected).</p></div>
 <div class="paragraph"><p>Having established a login to <em>Facebook</em>, transfer of a dive profile to one&#8217;s <em>Facebook</em> timeline is easy.
-A <em>Facebook</em> icon appears in the <strong>Dive Notes</strong> panel of <em>Subsurface</em> (See image <strong>A</strong> below). Ensure that the dive
-that you want to transfer to the timeline is depicted in the <em>Subsurface</em> <strong>Dive Profile</strong> panel. Select the
-<em>Facebook</em> icon, and a dialogue is shown, determining the amount of additional information transferred
-with the dive profile (see image <strong>B</strong>, below). In order to transfer a dive profile to <em>Facebook</em>, the name of a
+Ensure that the dive to be transfered to the timeline is depicted in the <em>Subsurface</em> <strong>Dive Profile</strong> panel. If, from the <strong>Main Menu</strong>, one selects <em>Share on &#8594; Facebook</em> (see image <strong>A</strong> below), a dialogue is shown, determining the amount of additional information transferred
+with the dive profile (image <strong>B</strong>, below). In order to transfer a dive profile to <em>Facebook</em>, the name of a
 <em>Facebook</em> album needs to be provided. The checkboxes on the lefthand side allow one to determine how much
 additional information should be transferred with the dive profile. This information is shown in the text box
-on the right hand side of the panel (see image <strong>B</strong>, below). You can easily edit the message that will be posted
-right there in the text box. Having specified the additional information and verified the text you want to post, select
-the <em>OK</em> button which triggers the transfer to <em>Facebook</em>. After a while, an acknowledgement dialogue appears,
+on the right hand side of the panel (image <strong>B</strong>, below). One can easily edit the message that will be posted
+with the dive profile. Having specified the additional information and verified the text, select
+the <em>OK</em> button that triggers the transfer to <em>Facebook</em>. After a while, an acknowledgement dialogue appears,
 indicating successful transfer to <em>Facebook</em>.</p></div>
-<div class="paragraph"><p>Both the Album created and the post to your time line will be marked as
-private. In order for friends to be able to see the post you have to
+<div class="paragraph"><p>Both the album created and the post to one&#8217;s timeline will be marked as
+private. In order for friends to be able to see the post,
 change its permissions from a regular Facebook login either in a browser
-or a Facebook app. While this is an extra step the developers felt that
-this was the better solution to avoid having unwanted posts in your public
+or a Facebook app. While this is an extra step
+this is the better solution to avoid having unwanted posts in one&#8217;s public
 timeline.</p></div>
 <div class="imageblock" style="text-align:center;">
 <div class="content">
 <img src="images/facebook2_f20.jpg" alt="Figure: Facebook login" />
 </div>
 </div>
-<div class="paragraph"><p>If required, then close the <em>Facebook</em> connection by either closing <em>Subsurface</em> or by selecting <em>File &#8594;  Preferences &#8594;  Facebook</em> from the Main Menu, and clicking the appropriate button on the Facebook Preferences panel.</p></div>
+<div class="paragraph"><p>If required, then close the <em>Facebook</em> connection by either closing <em>Subsurface</em> or by selecting <em>File &#8594;  Preferences &#8594;  Facebook</em> from
+the Main Menu, and clicking the appropriate button on the Facebook Preferences panel.</p></div>
 </div>
 <div class="sect2">
 <h3 id="S_Export_other">8.2. Export dive information  to other destinations or formats</h3>
@@ -3515,21 +3615,22 @@ Universal Dive Data Format (<em>UDDF</em>). Refer to <em>http://uddf.org</em> fo
 <p>
 <em>HTML</em> format, in which the dive(s) are stored in HTML files, readable
   with an Internet browser. Most modern web browsers are supported, but JavaScript
-  must be enabled. This HTML file is not intended to be edited
-  by the users.
-  The HTML dive log contains most of the information and also contains a search
+  must be enabled. The HTML export cannot be changed or edited.
+  It contains most of the information recorded in the dive log. However, it does not show the
+  calculated values in the <strong>Dive Profile</strong> panel, e.g. calculated cylinder pressure, gas
+  pressures and MOD. The HTML export contains a search
   option to search the dive log. HTML export is specified on the second tab of the
   Export dialog (image <strong>B</strong> above). A typical use of this option is to export all one&#8217;s
   dives to a smartphone or a tablet where it would serve as a very portable record
-  of dives useful for dive companies that wish to verify the dive history of a diver.
-  This does away with the need to carry one&#8217;s original logbook with one
+  of dives useful for dive companies that wish to verify the dive history of a diver,
+  often doing away with the need to carry one&#8217;s original logbook with one
   when doing dives with dive companies.
 </p>
 </li>
 <li>
 <p>
 <em>Worldmap</em> format, an HTML file with a world map upon which each dive and
-  some information about it are indicated. This map is not editable. However, if one selects any
+  some information about it are indicated. This map is not editable. If one selects any
   of the dive sites on the map, a summary of the dive is available in text, as shown
   in the image below.
 </p>
@@ -3564,13 +3665,13 @@ Subsurface Numbers: if this option is checked, the dive(s) are exported with the
 <li>
 <p>
 Export Yearly Statistics: if this option is checked, a yearly statistics table will
-   be attached with the HTML exports.
+   be attached to the HTML exports.
 </p>
 </li>
 <li>
 <p>
-Export List only: a list of dives will only be exported and the detailed dive
-   information will not be available.
+Export List only: a list of dives only (date, time, depth, duration) will be exported
+   and the detailed dive information, e.g. dive profile, will not be available.
 </p>
 </li>
 </ul></div>
@@ -3597,11 +3698,104 @@ security of the dive log is therefore critical. In order to have a dive log that
 resistant to failure of a home computer hard drive, loss or theft of equipment, the
 Cloud is an obvious solution. This also has the added benefit that one can access one&#8217;s dive
 log from anywhere in the world without having to carry it with oneself. For this
-reason, facilities such as <em>divelogs.de</em> and <em>Diving Log</em> offer facilities to store
-dive log information on the Internet. Although <em>Subsurface</em> does not offer integrated
-Cloud storage of dive logs, it is simple to achieve this using several of the
-existing facilities on the Internet.</p></div>
-<div class="paragraph"><p>For instance
+reason, facilities such as <em>divelogs.de</em> and <em>Diving Log</em> offer to store
+dive log information on the Internet.</p></div>
+<div class="paragraph"><p><em>Subsurface</em> includes access to a transparently integrated cloud storage
+back end that is available to all Subsurface users. Storing and retrieving a dive log
+from the cloud is no more difficult than accessing the dives on the local hard disk.
+The only requirement is that one should first register as a user on the cloud.
+To use <em>Subsurface cloud storage</em> , follow these steps:</p></div>
+<div class="sect2">
+<h3 id="_create_a_cloud_storage_account">9.1. Create a cloud storage account</h3>
+<div class="ulist"><ul>
+<li>
+<p>
+Open the <strong>Network Preferences</strong> by selecting <em>File</em> &#8594; <em>Preferences</em> &#8594; <em>Network</em>.
+</p>
+</li>
+<li>
+<p>
+In the section headed <em>Subsurface cloud storage</em>, enter an email address that
+   <em>Subsurface</em> can use for user registration.
+</p>
+</li>
+<li>
+<p>
+Enter a novel password that <em>Subsurface</em> will use to store the
+  dive log in the cloud.
+</p>
+</li>
+<li>
+<p>
+Click <em>Apply</em> to send the above email address and password to the
+  (remote) cloud server. The server responds by sending a verification PIN to
+  the above email address (This is the <strong>only</strong> occasion that <em>Subsurface</em> uses the
+  email address provided above). The <strong>Network Preferences</strong> dialog now has a new PIN text
+   box, not visible previously.
+</p>
+</li>
+<li>
+<p>
+Enter the PIN in the corresponding text box in the <strong>Network Preferences</strong> dialog
+(this field is only visible while the server is waiting for email
+address confirmation)
+</p>
+</li>
+<li>
+<p>
+Click <em>Apply</em> again. The <em>Subsurface cloud storage</em> account
+will be marked as verified and the <em>Subsurface cloud storage</em> service is initialised for use.
+</p>
+</li>
+</ul></div>
+</div>
+<div class="sect2">
+<h3 id="_using_em_subsurface_cloud_storage_em">9.2. Using <em>Subsurface cloud storage</em></h3>
+<div class="ulist"><ul>
+<li>
+<p>
+Once the cloud storage has been initialised, two new items appear in the
+   <em>File</em> menu of the main menu system: <em>Open cloud storage</em> and <em>Save to cloud storage</em>.
+These options allow the user to load and save data to the <em>Subsurface
+cloud storage</em> server.
+</p>
+</li>
+<li>
+<p>
+In the <em>Defaults Preferences</em> tab, one can select to use the <em>Subsurface cloud
+storage</em> data as one&#8217;s default data file by checking the check box marked <em>Cloud storage default file</em>.
+ This means that the data from
+the <em>Subsurface cloud storage</em> is loaded when <em>Subsurface</em> starts ans saved there when one closes <em>Subsurface</em>.
+</p>
+</li>
+<li>
+<p>
+<em>Subsurface</em> keeps a local copy of the data and the cloud facility remains fully
+functional even if used while disconnected to the Internet. <em>Subsurface</em> simply synchronises the
+data with the cloud server the next time ithe program is used while the computer is
+connected to the Internet.
+</p>
+</li>
+</ul></div>
+</div>
+<div class="sect2">
+<h3 id="S_Cloud_storage">9.3. Web access to <em>Subsurface cloud storage</em></h3>
+<div class="paragraph"><p>One of the nice side benefits of using <em>Subsurface cloud storage</em> is that
+one can also access one&#8217;s dive data from any web browser. Simply open
+<a href="https://cloud.subsurface-divelog.org"><em>https://cloud.subsurface-divelog.org</em></a>,
+log in with the same email and password, and you can see an HTML export of
+the last dive data that was synced to the <em>Subsurface cloud storage</em>. The dive information
+that is shown is only the contents of the recorded dive logs, NOT the calculated values
+shown in the <strong>Profile</strong> panel,
+including some cylinder pressures, deco ceilings and O<sub>2</sub>/He/N<sub>2</sub> partial pressures.</p></div>
+</div>
+<div class="sect2">
+<h3 id="_other_cloud_services">9.4. Other cloud services</h3>
+<div class="paragraph"><p>If one prefers not to use the integrated cloud storage of dive logs (and
+don&#8217;t need the web access), it is also simple to store
+dive logs in the cloud using several of the existing facilities on the
+Internet.
+For instance
 <a href="http://www.dropbox.com/"><em>Dropbox</em></a>
 offers a free application that allows
 files on the Dropbox servers to be seen as a local folder on one&#8217;s desktop computer.</p></div>
@@ -3624,107 +3818,162 @@ involved for this service. Dropbox (Windows, Mac
 and Linux) can be installed by accessing the
 <a href="http://www.dropbox.com/install"><em>Install Page on the Dropbox website</em></a>
 . Alternatively one can use <em>Dropbox</em> as a mechanism to backup one&#8217;s dive log. To
-Store a dive log in the Cloud, select <em>File &#8594;  Save as</em> from the <em>Subsurface</em> main menu,
+Store a dive log on <em>Dropbox</em>, select <em>File &#8594;  Save as</em> from the <em>Subsurface</em> main menu,
 navigate to the <em>Dropbox</em> folder and select the <em>Save</em> button. To access the dive log
-in the Cloud, select <em>File &#8594;  Open Logbook</em> from the <em>Subsurface</em>
+in <em>Dropbox</em>, select <em>File &#8594;  Open Logbook</em> from the <em>Subsurface</em>
 main menu and navigate to the dive log file in the <em>Dropbox</em> folder and select the
 <em>Open</em> button.</p></div>
 <div class="paragraph"><p>Several paid services exist on the Internet (e.g. Google, Amazon) where the same
 process could be used for the Cloud-based storage of dive logs.</p></div>
 </div>
 </div>
+</div>
 <div class="sect1">
 <h2 id="S_PrintDivelog">10. Printing a dive log</h2>
 <div class="sectionbody">
-<div class="paragraph"><p><em>Subsurface</em> provides a simple interface to print a whole dive log or only a
-few selected dives, including dive profiles and other contextual information.</p></div>
+<div class="paragraph"><p><em>Subsurface</em> provides a simple and flexible interface to print a whole dive log or only a few selected dives.
+  Pre-installed templates or a custom written template can be used to choose where the data are fitted into the page.</p></div>
 <div class="paragraph"><p>Before printing, two decisions are required:</p></div>
 <div class="ulist"><ul>
 <li>
 <p>
 Should the whole dive log be printed or only part of it? If only part of the
-  dive log is required, then the user must select the required dives from the <strong>Dive List</strong> panel.
+  dive log is required, then select the required dives from the <strong>Dive List</strong> panel.
 </p>
 </li>
 <li>
 <p>
-What gas partial pressure information is required on the dive profile? Users should select
-  the appropriate toggle-buttons on the button bar to the left of the Dive Profile panel.
+If the dive profiles needs printing, what gas partial pressure information should be shown? Select
+  the appropriate toggle-buttons on the button bar to the left of the <strong>Dive Profile</strong> panel.
 </p>
 </li>
 </ul></div>
-<div class="paragraph"><p>Now the print options should be selected to match the user&#8217;s needs. To do this, user should select <em>File &#8594;  Print</em> from
-the Main menu. The following dialogue appears (see the image on the left [A],
-below).</p></div>
+<div class="paragraph"><p>If <em>File &#8594;  Print</em> is selected from the Main menu, the the dialogue below (image <strong>A</strong>) appears. Three
+specifications are needed to achieve the desired information and page layout:</p></div>
 <div class="imageblock" style="text-align:center;">
 <div class="content">
-<img src="images/PrintDiveLog.jpg" alt="FIGURE: Print dialogue" />
+<img src="images/Print1_f22.jpg" alt="FIGURE: Print dialogue" />
 </div>
 </div>
-<div class="paragraph"><p>Under <em>Print type</em> users need to select one of three options:</p></div>
+<div class="olist arabic"><ol class="arabic">
+<li>
+<p>
+Under <em>Print type</em> select one of two options:
+</p>
 <div class="ulist"><ul>
 <li>
 <p>
-Print the complete Dive List: to do this, <em>Table Print</em> should be selected.
+<em>Dive list print</em>: Print dives from the <strong>Dive List</strong> panel with profiles and other information.
 </p>
 </li>
 <li>
 <p>
-Print the selected dives (dive profiles and all other information) at 6
-  dives per printed page: to do this, users should select <em>6 dives per page</em>.
-</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>.
-</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>.
+<em>Statistics print</em>: Print yearly statistics of the dives.
 </p>
 </li>
 </ul></div>
-<div class="paragraph"><p>Under <em>Print options</em> users need to select:</p></div>
+</li>
+<li>
+<p>
+Under <em>Print options</em> select:
+</p>
 <div class="ulist"><ul>
 <li>
 <p>
-Printing only the dives that have been selected from the dive list prior to
-  activating the print dialogue, achieved by checking the box <em>Print only
-  selected dives</em>.
+Printing only the dives selected from the dive list prior to
+  activating the print dialogue by checking the box <em>Print only
+  selected dives</em>. If this check box is <strong>not</strong> checked all dives in
+  the <strong>Dive List</strong> panel are printed.
 </p>
 </li>
 <li>
 <p>
-Printing in colour, achieved by checking the box with <em>Print in colour</em>.
+Printing in colour, achieved by checking the box with <em>Print in colour</em>. If this check box
+  is not checked, printing is in monochrome (grey scale).
+</p>
+</li>
+</ul></div>
+</li>
+<li>
+<p>
+Under <em>Template</em> select a template to be used as the page layout. There are several templates
+(see image <strong>B</strong>, above).
+</p>
+<div class="ulist"><ul>
+<li>
+<p>
+<em>Table</em>: This prints a summary table of all dives selected (see below).
+</p>
+</li>
+</ul></div>
+</li>
+</ol></div>
+<div class="imageblock" style="text-align:center;">
+<div class="content">
+<img src="images/Print_summarylist_f22.jpg" alt="FIGURE: Print summary table" />
+</div>
+</div>
+<div class="ulist"><ul>
+<li>
+<p>
+<em>Flow layout</em>: Print the text associated with each dive without printing the dive profiles
+     of each dive (see below):
+</p>
+</li>
+</ul></div>
+<div class="imageblock" style="text-align:center;">
+<div class="content">
+<img src="images/Print_flow_layout_f22.jpg" alt="FIGURE: Print flow layout" />
+</div>
+</div>
+<div class="ulist"><ul>
+<li>
+<p>
+<em>One Dive</em>: Print one dive per page, also showing the dive profile (see below)
+</p>
+</li>
+</ul></div>
+<div class="imageblock" style="text-align:center;">
+<div class="content">
+<img src="images/print2_f22.jpg" alt="FIGURE: Print one dive / page" />
+</div>
+</div>
+<div class="ulist"><ul>
+<li>
+<p>
+<em>Two Dives</em>: Print two dives per page, also showing the dive profiles.
+</p>
+</li>
+<li>
+<p>
+<em>Six Dives</em>: Print six dives per page, also showing the dive profiles.
 </p>
 </li>
 </ul></div>
-<div class="paragraph"><p>The <em>Ordering</em> affects the layout of the page (or part of it) for each dive.
-The dive profile could be printed at the top of each dive, with the textual
-information underneath, or it could be printed with the textual information at
-the top with the dive profile underneath. Users should select the appropriate option in the
-print dialogue. See the image below which has a layout with
-text below the dive profile.</p></div>
 <div class="paragraph"><p>Users can <em>Preview</em> the printed page by selecting the <em>Preview</em> button on the
-dialogue. After preview, changes to the options in the print dialogue can be
-made, resulting in a layout that fits personal taste.</p></div>
-<div class="paragraph"><p>Next, select the <em>Print</em> button in the dialogue. This activates the regular print
-dialogue used by the user operating system (image [<strong>B</strong>] in the middle, above),
-allowing them to choose a printer and to set its properties (image [<strong>C</strong>] on the right,
-above).
-It is important to set the print resolution of the printer to an appropriate value by
-changing
-the printer properties. Finally, one can print the dives. Below is a (rather small)
-example of
-the output for one particular page.</p></div>
+dialogue (see image <strong>A</strong> at the start of this section). After preview, changes to
+the options in the print dialogue can be made, resulting in a layout that fits personal taste.</p></div>
+<div class="paragraph"><p>Next, select the <em>Print</em> button (see image <strong>A</strong> at the start of this section). This activates the regular print
+dialogue used by the user operating system,
+allowing one to choose a printer and to set its properties (see image below):</p></div>
+<div class="imageblock" style="text-align:center;">
+<div class="content">
+<img src="images/Print_print_f22.jpg" alt="FIGURE: Print dialog" />
+</div>
+</div>
+<div class="paragraph"><p>Set the print resolution of the printer to an appropriate value by changing
+the printer <em>Properties</em>. Finally, select the <em>Print</em> button to print the dives.
+Below is a (rather small) example of the output for one particular page.</p></div>
 <div class="imageblock" style="text-align:center;">
 <div class="content">
 <img src="images/Printpreview.jpg" alt="FIGURE: Print preview page" />
 </div>
 </div>
+<div class="sect2">
+<h3 id="_writing_a_custom_print_template_advanced">10.1. Writing a custom print template (advanced)</h3>
+<div class="paragraph"><p>Writing a custom template is an effective way to produce highly customized printouts. Subsurface uses HTML templates
+to render printing. One can create a template, export a new template, import an existing template and delete an existing template by using the appropriate buttons under the <em>Template</em> dropdown list in the print dialogue. See <a href="#S_APPENDIX_E">APPENDIX E</a> for information on how to write or modify a template.</p></div>
+</div>
 </div>
 </div>
 <div class="sect1">
@@ -3734,12 +3983,12 @@ the output for one particular page.</p></div>
 Suunto Vyper (Stinger, Mosquito, D3, Vyper, Vytec,
 Cobra, Gekko and Zoop) family of dive computers are supported. A large number of settings of these dive computers
 can be read and changed to different values. As a first step, ensure that the appropriate hardware driver
-is installed for the dive computer and that the device name of the dive computer is known.
+is installed for the dive computer (also required for downloading dives) and that the device name of the dive computer is known.
 See <a href="#_appendix_a_operating_system_specific_information_for_importing_dive_information_from_a_dive_computer">APPENDIX A</a> for information on how to do this.</p></div>
 <div class="paragraph"><p>Once the dive computer is connected to the <em>Subsurface</em> computer, select <em>File &#8594;  Configure dive
 computer</em> from the <em>Main Menu</em>. Provide the appropriate device name in the text box at the
-top of the configuration panel that opens and select the appropriate dive
-computer model from the panel on the lefthand (see image below).</p></div>
+top of the configuration panel and select the appropriate dive
+computer model from the panel on the left-hand (see image below).</p></div>
 <div class="imageblock" style="text-align:center;">
 <div class="content">
 <img src="images/Configure_dc_f20.jpg" alt="FIGURE: Configure dive computer" />
@@ -3750,7 +3999,7 @@ computer model from the panel on the lefthand (see image below).</p></div>
 <li>
 <p>
 <strong>Retrieve available details</strong>. This loads the existing configuration from the dive computer
-   to <em>Subsurface</em>, showing this in the configuration panel.
+   to <em>Subsurface</em>, showing it in the configuration panel.
 </p>
 </li>
 <li>
@@ -3783,12 +4032,14 @@ computer model from the panel on the lefthand (see image below).</p></div>
 <div class="sect1">
 <h2 id="S_Preferences">12. Setting user <em>Preferences</em> for <em>Subsurface</em></h2>
 <div class="sectionbody">
-<div class="paragraph"><p>There are several settings within <em>Subsurface</em> that the user can specify. These
-are found when selecting <em>File &#8594;  Preferences</em>. The settings are performed in
-five groups: <strong>Defaults</strong>, <strong>Units</strong>, <strong>Graph</strong>, <strong>Language</strong> and <strong>Network</strong>. All five sections
+<div class="paragraph"><p>There are several user-definable settings within <em>Subsurface</em>, found by selecting
+<em>File &#8594;  Preferences</em>. The settings are performed in
+seven groups: <strong>Defaults</strong>, <strong>Units</strong>, <strong>Graph</strong>, <strong>Language</strong> and <strong>Network</strong>, <strong>Facebook</strong> and <strong>Georeference</strong>,
+all of which
 operate on the same principles: the user must specify the settings that are to be changed, then
 these changes are saved using the <strong>Apply</strong> button. After applying all the new settings users can then
-leave the settings panel by selecting <strong>OK</strong>.</p></div>
+leave the settings panel by selecting <strong>OK</strong>. If <strong>Discard</strong> is selected, changes to the preferences
+are not saved.</p></div>
 <div class="sect2">
 <h3 id="_defaults">12.1. Defaults</h3>
 <div class="paragraph"><p>There are several settings in the <strong>Defaults</strong> panel:</p></div>
@@ -3806,24 +4057,43 @@ leave the settings panel by selecting <strong>OK</strong>.</p></div>
 </li>
 <li>
 <p>
-<strong>Dives</strong>: For the <em>Default Dive File</em> one need to specify the directory and
+<strong>Dives</strong>: For the <em>Default Dive File</em> one needs to specify the directory and
      file name of one&#8217;s
-     electronic dive log book. This is a file with filename extension .xml. When
-     launched, <em>Subsurface</em> will automatically load the specified dive log book.
+     electronic dive log book. This is a file with filename extension of either <em>.xml</em> or <em>ssrf</em>. When
+     launched, <em>Subsurface</em> will automatically load the specified dive log book. There are three options:
+</p>
+<div class="ulist"><ul>
+<li>
+<p>
+<em>No default file</em>: When checked, <em>Subsurface</em> does not automatically load a dive log at startup.
 </p>
 </li>
 <li>
 <p>
+<em>Local default file</em>: When checked, <em>Subsurface</em> automatically loads a dive log from the local hard disk
+       as described above.
+</p>
+</li>
+<li>
+<p>
+<em>Cloud storage default file</em>: When checked, <em>Subsurface automatically loads the dive log from the cloud
+       device that was initialised using the <strong>Preferences</strong> _Network</em> tab (see below).
+</p>
+</li>
+</ul></div>
+</li>
+<li>
+<p>
 <strong>Display invalid</strong>:  Dives can be marked as invalid (when a user wishes to hide
-     dives that he/she don&#8217;t consider valid dives, e.g. pool dives, but still want to
+     dives that he/she doesn&#8217;t consider valid dives, e.g. pool dives, but still want to
      keep them in the dive log). This controls whether those dives are displayed in
      the dive list.
 </p>
 </li>
 <li>
 <p>
-<strong>Default cylinder</strong>: Here users can specify the default cylinder listed in
-     the <strong>Equipment</strong> tab of the <strong>Dive Notes</strong> panel.
+<strong>Default cylinder</strong>: Specify the default cylinder listed in
+     the <strong>Equipment</strong> tab of the <strong>Notes</strong> panel.
 </p>
 </li>
 <li>
@@ -3833,20 +4103,12 @@ leave the settings panel by selecting <strong>OK</strong>.</p></div>
      dive. When viewing a different dive, these changes in axis characteristics do not
      happen instantaneously, but are animated. The <em>Speed</em> of animations can be controlled
      by setting this slider
-     with faster animation speed to the left, with a 0 value representing no animation
+     with faster animation speed to the left, and a 0 value representing no animation
      at all.
 </p>
 </li>
 <li>
 <p>
-<strong>Subsurface web service</strong>: When one subscribes to the <a href="#S_Companion">Subsurface web service</a>, a very
-     long and hard-to-remember userID is issued. This is the place to save that userID. By
-     checking the option <em>Save User ID locally?</em>, one ensures that a local copy of that userID
-     is saved.
-</p>
-</li>
-<li>
-<p>
 <strong>Clear all settings</strong>: As indicated in the button below this heading, all settings are
      cleared and set to default values.
 </p>
@@ -3860,11 +4122,16 @@ leave the settings panel by selecting <strong>OK</strong>.</p></div>
 <img src="images/Pref2_f20.jpg" alt="FIGURE: Preferences Units page" />
 </div>
 </div>
-<div class="paragraph"><p>Here user can choose between metric and imperial units of depth, pressure,
+<div class="paragraph"><p>Here users can choose between metric and imperial units of depth, pressure,
 volume, temperature and mass. By selecting the Metric or Imperial radio button
-at the top, users can specify that all units are in the chosen measurement system.
+at the top, one can specify that all units are in the chosen measurement system.
 Alternatively, if one selects the <strong>Personalise</strong> radio button, units can be selected
 independently, with some units in the metric system and others in imperial.</p></div>
+<div class="paragraph"><p>Irrespective
+of the above settings, dive time measurements can be either in seconds or minutes.
+Choose the appropriate option. GPS coordinates can be represented either as
+traditional coordinates (degrees, minutes, seconds) or as decimal degrees
+Choose the appropriate option.</p></div>
 </div>
 <div class="sect2">
 <h3 id="_graph">12.3. Graph</h3>
@@ -3884,30 +4151,37 @@ independently, with some units in the metric system and others in imperial.</p><
 <li>
 <p>
 Thresholds: <em>Subsurface</em> can display the nitrogen, oxygen and the helium partial pressures during
-   the dive. These are enabled using the toolbar on the left hand side of the <strong>Dive Profile</strong>
+   the dive, enabled by using the toolbar on the left hand side of the <strong>Dive Profile</strong>
    panel. For each of these graphs users can specify a threshold value on the right-hand side of the
-   Preferences panel. If any of the graphs go above this threshold level, the graph is
-   highlighted in red, indicating that the threshold has been exceeded.
+   Preferences panel. If any of the graphs go above the specified threshold level, the graph is
+   highlighted in red, indicating that the particular partial pressure threshold has been exceeded.
 </p>
 </li>
 <li>
 <p>
-<em>Draw dive computer reported ceiling red</em>: This checkbox allows exactly what it says.
+_Max pO<sub>2</sub> is used for calculating the MOD when displaying the maximum operative depth (MOD)
+   for a dive. Specify an appropriate partial pressure. A value of 1.4 is commonly used.
+</p>
+</li>
+<li>
+<p>
+<em>Draw dive computer reported ceiling red</em>: This checkbox allows exactly what it says. By default
+   the computer reported ceiling is shown in white.
    Not all dive computers report ceiling values. If the dive computer does report it, it may differ
-   from the ceilings calculated by <em>Subsurface</em>. This is because of the different algorithms and gradient factors available for calculating ceilings, as well as the dynamic way that a
+   from the ceilings calculated by <em>Subsurface</em> because of the different algorithms and
+   gradient factors, as well as the dynamic way that a
    dive computer can calculate ceilings during a dive.
 </p>
 </li>
 <li>
 <p>
-<em>Show unused cylinders in Equipment Tab</em>: This checkbox allows display of information about unused cylinders when viewing the <strong>Equipment Tab</strong>. Conversely, if this box is not checked, and any cylinders entered using the <strong>Equipment Tab</strong> are not used (e.g. there was no gas switch to such a cylinder), then these cylinders are omitted from that list.
+<em>Show unused cylinders in Equipment Tab</em>: This checkbox allows display of information about unused cylinders when viewing the <strong>Equipment Tab</strong>. Conversely, if this box is not checked, and if any cylinders entered using the <strong>Equipment Tab</strong> are not used (e.g. there was no gas switch to such a cylinder), then these cylinders are omitted from that list.
 </p>
 </li>
 <li>
 <p>
-<em>Show average depth</em>: Activating this checkbox causes <em>Subsurface</em> to draw a grey line across
-   the dive profile, indicating the mean depth of the dive up to a particular point in time during
-   that dive. Normally this is a u-shaped line indicating the deepest average depth just before the
+<em>Show average depth</em>: If this box is checked, the <strong>Dive Profile</strong> panel contains a grey line that indicates
+    the mean depth of the dive up to any time instant during the dive. Normally this is a u-shaped line indicating the deepest mean depth just before the
    ascent.
 </p>
 </li>
@@ -3917,18 +4191,18 @@ Thresholds: <em>Subsurface</em> can display the nitrogen, oxygen and the helium
 <p>
 <strong>Misc</strong>:
 </p>
-<div class="ulist"><ul>
+<div class="ulist" id="GradientFactors_Ref"><ul>
 <li>
 <p>
-Gradient Factors:* Here users can set the <em>gradient factors</em> used while diving. GF_Low is
+Gradient Factors (GFLow and GFHigh):* Set the <em>gradient factors</em> used while diving. GF_Low is
    the gradient factor at depth and GF_High is used just below the surface.
    At intermediate depths gradient factors between GF_Low and GF_High are used.
    Gradient factors add conservatism to the nitrogen exposure during a dive, in a
    similar way that many dive computers have a conservatism setting. The lower
    the value of a gradient factor, the more conservative the calculations are with
    respect to nitrogen loading and the deeper the ascent ceilings are. Gradient
-   factors of 20/60 are considered conservative and values of 60/90 are considered
-   harsh. Checking <strong>GFLow at max depth</strong> box causes GF_Low to be used at the
+   factors of 20/60 are considered conservative and values of 70/90 are considered
+   harsh. Checking the <strong>GFLow at max depth</strong> box causes GF_Low to be used at the
    deepest depth of a dive. If this box is not checked, GF_Low is applied at
    all depths deeper than the first deco stop. For more information see:
 </p>
@@ -3969,16 +4243,15 @@ Gradient Factors:* Here users can set the <em>gradient factors</em> used while d
 <li>
 <p>
 <em>Default CCR setpoint for dive planning:</em> Specify the O<sub>2</sub> setpoint for a
-    CCR dive plan. This determines the pO<sub>2</sub> that will be maintained
-    during a particular dive. This is the setpoint that is used at the start
-    of any CCR dive. Setpoint changes during the dive can be added via the
+    CCR dive plan. This determines the pO<sub>2</sub>  maintained
+    during a particular dive. Setpoint changes during the dive can be added via the
     profile context menu.
 </p>
 </li>
 <li>
 <p>
 <em>pSCR O<sub>2</sub> metabolism rate:</em> For a semiclosed rebreather (pSCR) system, this is the
-    volume of oxygen used by a diver each minute. Set this value for pSCR dive planning
+    volume of oxygen used by a diver during a minute. Set this value for pSCR dive planning
     and decompression calculations.
 </p>
 </li>
@@ -3986,7 +4259,7 @@ Gradient Factors:* Here users can set the <em>gradient factors</em> used while d
 <p>
 <em>pSCR ratio:</em> For pSCR equipment the dump ratio is the ratio of gas released to the
     environment to that of the gas recirculated to the diver. Set this value for a
-    pSCR dive plan.
+    pSCR dive plan. A 1:10 ratio is commonly used.
 </p>
 </li>
 </ul></div>
@@ -4003,35 +4276,72 @@ Gradient Factors:* Here users can set the <em>gradient factors</em> used while d
 </div>
 <div class="paragraph"><p>A checkbox allows one to use the <em>System Default</em> language which in most cases
 will be the correct setting; with this <em>Subsurface</em> simply runs in the same
-language / country settings as the underlying OS. If this is for some reason
-undesirable users can uncheck this checkbox and pick a language / country
+language / country settings as the underlying operating system. If this is for some reason
+undesirable one can uncheck this checkbox and pick a language / country
 combination from the list of included localizations. The <em>Filter</em> text box allows
 one to list similar languages. For instance there are several system variants of English
-or French. This particular preference requires a restart of <em>Subsurface</em> to take
-effect.</p></div>
+or French. <strong>This particular preference requires a restart of <em>Subsurface</em> to take
+effect</strong>.</p></div>
 </div>
 <div class="sect2">
 <h3 id="_network">12.5. Network</h3>
-<div class="paragraph"><p>This panel facilitates communication between <em>Subsurface</em> and data sources on the Internet.</p></div>
+<div class="paragraph"><p>This panel facilitates communication between <em>Subsurface</em> and data sources on the Internet.
+This is important, for instance, when <em>Subsurface</em> needs to communicate with Internet
+services such as Cloud storage or the <a href="#S_Companion"><em>Subsurface Companion app</em></a>. These Internet requirements are determined by one&#8217;s type of
+connection to the Internet and by the Internet Service Provider (ISP) used.
+One&#8217;s ISP should provide the appropriate information.</p></div>
 <div class="imageblock" style="text-align:center;">
 <div class="content">
 <img src="images/Pref5_f20.jpg" alt="FIGURE: Preferences Network page" />
 </div>
 </div>
-<div class="paragraph"><p>This is important, for instance, when <em>Subsurface</em> needs to communicate with Internet
-services such as the <a href="#S_Companion"><em>Subsurface Companion app</em></a> or data export/import
-from <em>Divelogs.de</em>. These Internet requirements are determined by one&#8217;s type of
-connection to the Internet and by the Internet Service Provider (ISP) used.
-One&#8217;s ISP should provide the appropriate information.
-If a proxy server is used for Internet access, the appropriate information needs
-to be provided here. The type of proxy needs to be selected from the dropdown list.
+<div class="paragraph"><p>This dialogue has three sections:</p></div>
+<div class="ulist"><ul>
+<li>
+<p>
+<em>Proxy type</em>:
+If a proxy server is used for Internet access, the type of proxy needs to be selected from the dropdown list,
 after which the IP address of the host and the appropriate port number should
 be provided. If the proxy server uses authentication, the appropriate userID and
-password also needs to be provided so that <em>Subsurface</em> can automatically pass
-through the proxy server to access the Internet.</p></div>
+password are required so that <em>Subsurface</em> can automatically pass
+through the proxy server to access the Internet. This information is usually obtained
+from one&#8217;s ISP.
+</p>
+</li>
+<li>
+<p>
+<em>Subsurface cloud storage</em>: To store one&#8217;s dive log in the cloud, a valid email address
+   and password are required. This allows <em>Subsurface</em> to email security information
+   regarding cloud storage to a user, and to set up the cloud storage appropriately.
+   Two additional options are given:
+</p>
+<div class="ulist"><ul>
+<li>
+<p>
+<em>Sync to cloud in the background</em>: This option allows saving of dive information to the cloud storage
+   while the user performs other tasks within <em>Subsurface</em>.
+</p>
+</li>
+<li>
+<p>
+<em>Save password locally</em>: This allows local storage of the cloud storage password. Note that this
+   information is saved in raw text form, not encoded in any way.
+</p>
+</li>
+</ul></div>
+</li>
+<li>
+<p>
+<em>Subsurface web service</em>: When one subscribes to the <a href="#S_Companion">Subsurface web service</a>, a very
+     long and hard-to-remember userID is issued. This is the place to save that userID. By
+     checking the option <em>Save User ID locally?</em>, one ensures that a local copy of that userID
+     is saved.
+</p>
+</li>
+</ul></div>
 </div>
 <div class="sect2">
-<h3 id="_facebook_accesss">12.6. Facebook Accesss</h3>
+<h3 id="S_Facebook">12.6. Facebook Accesss</h3>
 <div class="paragraph"><p>This panel allows one to log into a Facebook account in order to transfer information
 from Subsurface to Facefook.</p></div>
 <div class="imageblock" style="text-align:center;">
@@ -4041,11 +4351,25 @@ from Subsurface to Facefook.</p></div>
 </div>
 <div class="paragraph"><p>If one provides a valid Facebook userID and password, a
 connection to Facebook is created. The connection to Facebook is closed when one
-closes down Subsurface. At this point the checkbox labelled "Keep connection to Subsurface",
+closes down Subsurface. Currently the checkbox labelled "Keep me logged in to Subsurface",
 on the login screen has no effect.
 See the section <a href="#S_facebook">Exporting dive profiles to Facebook</a>
 for more information.</p></div>
 </div>
+<div class="sect2">
+<h3 id="_georeference">12.7. Georeference</h3>
+<div class="paragraph"><p><em>Subsurface</em> provides a geo-lookup service (that is, given the coordinates of a dive site (derived from
+a click on the <strong>Dive Map panel</strong> at the bottom right of the <em>Subsurface</em> window, or from a GPS instrument or
+from the <em>Subsurface</em> Companion app), a lookup on the Internet is performed to find
+the name of the closest known location. Obviously this function only works if <em>Subsurface</em> has an
+Internet connection. The preference of the dive site name can be configured, e.g. <em>Country/State/City</em>
+or <em>City/State/Country</em> (see image below).</p></div>
+<div class="imageblock" style="text-align:center;">
+<div class="content">
+<img src="images/Pref7_f20.jpg" alt="FIGURE: Facebook login panel" />
+</div>
+</div>
+</div>
 </div>
 </div>
 <div class="sect1">
@@ -4108,7 +4432,7 @@ A user who is not absolutely sure about any of the above requirements should not
 <h3 id="_the_em_subsurface_em_dive_planner_screen">13.1. The <em>Subsurface</em> dive planner screen</h3>
 <div class="paragraph"><p>Like the <em>Subsurface</em> dive log, the planner screen is divided into several sections (see image below). The <strong>setup</strong>
 parameters for a dive are entered into the several sections on the left hand side of the screen.
-The setup is divided into several sections: Available Gases, Rates, Planning, Gas Options and Dive Notes.</p></div>
+The setup is divided into several sections: Available Gases, Rates, Planning, Gas Options and Notes.</p></div>
 <div class="paragraph"><p>At the top right hand is a green <strong>design panel</strong> upon which the profile of the dive can be
 manipulated directly by dragging and clicking as explained below. This feature makes the
 <em>Subsurface</em> dive planner unique in ease of use.</p></div>
@@ -4122,11 +4446,11 @@ any warning messages about the dive plan are printed.</p></div>
 </div>
 </div>
 <div class="sect2">
-<h3 id="_open_circuit_dives_as_an_example_of_dive_planning">13.2. Open circuit dives as an example of dive planning</h3>
+<h3 id="_open_circuit_dives">13.2. Open circuit dives</h3>
 <div class="ulist"><ul>
 <li>
 <p>
-Towards the left bottom of the planner (circled in blue in the image below) is a dropbox with three options. Select the appropriate one of these:
+Towards the centre bottom of the planner (circled in blue in the image above) is a dropbox with three options. Select the appropriate one of these:
 </p>
 <div class="ulist"><ul>
 <li>
@@ -4148,41 +4472,167 @@ pSCR
 </li>
 <li>
 <p>
-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.
+Choose the Open Circuit option.
 </p>
 </li>
 <li>
 <p>
-In the table labeled <em>Available Gases</em>, add the information of the cylinders to be used
+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 intended dive, Atmospheric Pressure and Altitude
+  above sea level of the dive site. The atmospheric pressure can also be entered as an altitude
+  in metres, assuming a sea-level 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 cylinder is assumed to contain air. Otherwise enter the oxygen and/or helium
   concentration in the boxes provided in this dialogue. Add additional cylinders by using the
-  "+" icon to the top righthand of the dialogue.
+  "+" icon to the top right-hand of the dialogue.
 </p>
 </li>
 <li>
 <p>
-The dialogue indicating <em>Dive Planner Points</em> is usually not used at this stage of the dive
-  planning.
+The profile of the planned dive can be created in two ways:
+</p>
+<div class="ulist"><ul>
+<li>
+<p>
+Drag the waypoints
+    (the small white circles) on the existing dive profile in a way to represent the dive. Additional
+    waypoints can be created by double-clicking the existing dive profile. Waypoints can be deleted
+    by right-clicking a particular waypoint and selecting the <em>delete</em> item from the resulting
+    context menu.
+</p>
+</li>
+<li>
+<p>
+The most efficient way to create a dive profile is to enter the appropriate values into the table
+    marked <em>Dive planner points</em>. The first line of the table represents the duration and the final
+    depth of the descent from the surface. Subsequent segments describe the bottom phase of the dive.
+    The <em>CC set point</em> column is only relevant for closed circuit divers.
+    The ascent is usually not specified because this is what the planner is supposed to calculate.
+    Add additional segments to the profile by selecting the "+" icon at the top right hand of the
+    table. Segments entered into the <em>Dive planner points</em> table automatically appear in the <strong>Dive
+    Profile</strong> diagram.
 </p>
 </li>
 </ul></div>
-<div class="paragraph"><p><strong>The planning is performed in three stages</strong></p></div>
+</li>
+</ul></div>
+<div class="sect3">
+<h4 id="_recreational_dives">13.2.1. Recreational dives</h4>
+<div class="paragraph"><p>Recreational mode is what comes closest to planning a dive based on the non-decompression limit (NDL).
+It computes the maximal time a diver can stay at the current depth without incurring any mandatory decompression
+stops and without using more than the existing gas (minus a reserve). The planner automatically takes
+into account the nitrogen load incurred in previous dives. But conventional dive tables are also used in a
+way that can take into account previous dives. Why use a dive planner for recreational dives? Using
+recreational dive tables, the maximum depth of a dive is taken into account. However, few dives are
+undertaken at a constant depth corresponding to the maximum depth (i.e. a "square" dive profile). This means
+that dive tables overestimate the nitrogen load incurred during previous dives. The <em>Subsurface</em>
+dive planner calculates nitrogen load according to the real dive profiles of all uploaded previous dives,
+in a similar way as dive computers calculate nitrogen load during a dive. This means that the diver gets <em>credit</em>
+in terms of nitrogen loading for not remaining at maximum depth during previous dives, enabling planning of a
+longer subsequent dive. For the planner to work it is therefore crucial to upload all previous dives
+onto <em>Subsurface</em> before performing dive planning.</p></div>
+<div class="paragraph"><p>To plan a dive, the appropriate settings need to be defined.</p></div>
+<div class="ulist"><ul>
+<li>
+<p>
+Ensure that the date and time is set to that of the intended dive. This allows calculation of
+the nitrogen load incurred during previous dives.
+</p>
+</li>
+<li>
+<p>
+Immediately under the heading <em>Planning</em> are two checkboxes <em>Recreational</em> and <em>Safety Stop</em>.
+  Check these two boxes.
+</p>
+</li>
+<li>
+<p>
+Then define the cylinder size,
+  the gas mixture (air or % oxygen) and the starting cylinder pressure in the top left-hand
+  section of the planner under <em>Available gases</em>.
+</p>
+</li>
+<li>
+<p>
+The planner calculates whether the specified cylinder contains enough air/gas to complete
+  the planned dive. In order for this to be realistic, under <em>Gas options</em>, specify an appropriate
+  surface air consumption (SAC) rate for <em>Bottom SAC</em>. Suitable values are between 15 l/min and 30 l/min,
+  with novice divers or difficult dives requiring SAC rates closer to 30l/min.
+</p>
+</li>
+<li>
+<p>
+Define the amount of gas that the cylinder must have at the end of the bottom section of the
+  dive just before ascent. A value of 50 bar is often used. The reason for this reserve gas is to provide for the possible
+  need need to bring one&#8217;s buddy to the surface using gas sharing. How much gas is used in
+  sharing depends on the depth of the ascent. This can be a bit hard to estimate, so most agencies assume a
+  fixed amount of gas, or actually of pressure e.g. 40 or 50 bar or 25% or 33% (rule of thirds). But <em>Subsurface</em> can do better
+  because it knows about the ascent and that is why we add the amount of gas during the ascent (i.e. the "deco gas“).
+  Subsurface still uses a fixed pressure „reserve“ but that is supposed to be for the additional gas used around the realisation
+  that there is a problem and one&#8217;s pulse rate goes up when one starts to buddy breathe. This reserve amount is user configurable.
+</p>
+</li>
+<li>
+<p>
+Define the depth of the dive by dragging the waypoints (white dots) on the dive profile or
+  (even better) defining the appropriate depths using the table under <em>Dive planner points</em> as
+  desribed under the previous heading. If
+  this is a multilevel dive, set the appropriate dive depths to represent the dive plan by adding
+  waypoints to the dive profile or by adding appropriate dive planner points to the <em>Dive Planner Points</em>
+  table. <em>Subsurface</em> will automatically extend the bottom section of the dive to the maximum
+  duration within the no-decompression limits (NDL).
+</p>
+</li>
+<li>
+<p>
+The ascent speed can be changed. The default ascent speeds are those considered safe for recreational
+  divers.
+</p>
+</li>
+</ul></div>
+<div class="paragraph"><p>The dive profile in the planner indicates the maximum dive time within no-deco limits using the
+Bühlmann ZH-L16 algorithm and the gas and depth settings specified as described above. The <em>Subsurface</em> planner
+allows rapid assessment of dive duration as a function of dive depth, given the nitrogen load incurred during previous dives. The
+dive plan includes estimates of the amount of air/gas used, depending on the cylinder settings specified
+under <em>Available gases</em>. If the initial cylinder pressure is set to 0, the dive duration shown is the
+true no-deco limit (NDL) without taking into account gas used during the dive. If the surface above the dive profile is RED
+it means that recreational dive limits are exceeded and either the dive duration or the dive depth needs to be reduced.</p></div>
+<div class="paragraph"><p>Below is an image of a dive plan for a recreational dive at 30 metres. Although the no-deco limit (NDL) is 23
+minutes, the duration of the dive is limited by the amount of air in the cylinder, reflected by the information in the
+text box at the bottom right of the panel that requires sufficient air for buddy-sharing during the ascent.</p></div>
+<div class="imageblock" style="text-align:center;">
+<div class="content">
+<img src="images/rec_diveplan.jpg" alt="FIGURE: A recreational dive plan: setup" />
+</div>
+</div>
+</div>
+<div class="sect3">
+<h4 id="_non_recreational_open_circuit_dives_including_decompression">13.2.2. Non-recreational open circuit dives, including decompression</h4>
+<div class="paragraph"><p>Non-recreational dive planning involves exceeding the no-deco limits and/or using multiple breathing gases.
+Such dives are planned in three stages:</p></div>
 <div class="paragraph"><p><strong>a) Nitrogen management</strong>: This is performed by specifying the rates for descent and ascent,
-as well as the gradient factors (GFLow and GFHigh) under the headings <em>Rates</em> and <em>Planning</em>
-to the bottom left of the planning screen. Initially, the GFHigh and GFLow values in the <em>Preferences</em>
+as well as the deco model (GFLow, GFHigh or Conservatism level) under the headings <em>Rates</em> and <em>Planning</em>
+to the bottom left of the planning screen. Two deco models are supported the Bühlmann model and the VPM-B
+model. Select one of the two models. When selecting the Bühlmann model, the gradient factors (GF_high and GF_low
+need to be specified. Initially, the GFHigh and GFLow values in the <em>Preferences</em>
 panel of <em>Subsurface</em> is used. If these are changed within the planner (see <em>Gas Options</em> within
 the planner), the new values are
 used without changing the original values in the <em>Preferences</em>. Gradient Factor settings strongly affect the calculated ceilings and their depths.
 A very low GFLow value brings about decompression stops early on during the dive.
- ** For more information about Gradient factors, see the section on <a href="#S_GradientFactors">Gradient Factor Preference settings</a>.
-For more information external to this manual see:</p></div>
+ ** For more information about Gradient factors, see the section on <a href="#S_GradientFactors">Gradient Factor Preference settings</a>.</p></div>
+<div class="paragraph"><p>If the VPM-B model is selected, the Conservatism_level needs to be specified on a scale of 0 (least conservative) to 4 (most conservative).
+This model tends to give deco stops at deeper levels than the Bühlmann model and often results in slightly shorter
+dive durations than the Bühlmann model. When selecting one of these models, keep in mind that they are NOT exact physiological models but
+only mathematical models that appear to work in practice.</p></div>
+<div class="paragraph"><p>For more information external to this manual see:</p></div>
 <div class="ulist"><ul>
 <li>
 <p>
@@ -4197,7 +4647,7 @@ For more information external to this manual see:</p></div>
 <li>
 <p>
 <a href="http://www.amazon.com/Deco-Divers-Decompression-Theory-Physiology/dp/1905492073/ref=sr_1_1?s=books&amp;ie=UTF8&amp;qid=1403932320&amp;sr=1-1&amp;keywords=deco+for+divers"><em>Deco for Divers</em>, by Mark Powell (2008). Aquapress</a> Southend-on-Sea, UK. ISBN 10: 1-905492-07-3.
-An excellent non-technical review.
+An excellent non-technical review that discusses both the Bühlmann deco model and the VPM-B model.
 </p>
 </li>
 </ul></div>
@@ -4236,7 +4686,7 @@ planner, a default dive of depth 15 m for 40 min is offered in the bue design su
 right hand of the screen. The white dots (waypoints) on the
 profile can be dragged with a mouse. Create more waypoints by double-clicking on the profile
 line and ensuring that the profile reflects the intended dive. Drag the waypoints to represent
-the depth and duration of the dive. It is NOt necessary to specify the ascent part of the dive
+the depth and duration of the dive. It is NOT necessary to specify the ascent part of the dive
 since the planner calculates this, based on the settings that have been specified.
 If any of the management limits (for nitrogen, oxygen or gas) is exceeded, the surface
 above the dive profile changes from BLUE to RED.</p></div>
@@ -4246,7 +4696,7 @@ of that table corresponds to one of the gas mixtures specified in the <em>Availa
 Add new waypoints until the main features of the dive have been completed, e.g. the
 bottom time segment and deep stops (if these are implemented). Leave the remaining
 waypoints on the ascent to <em>Subsurface</em>. In most cases <em>Subsurface</em>
-computes additional way points in order to fulfill decompression requirements for that
+computes additional way points in order to fulfil decompression requirements for that
 dive. A waypoint can be moved by selecting that waypoint and by using the arrow keys.
 The waypoints listed in the <em>Dive Planner Points</em> dialogue can be edited by hand in
 order to obtain a precise presentation of the dive plan. In fact, one can create the
@@ -4279,8 +4729,8 @@ in the <strong>Dive List</strong> panel of <em>Subsurface</em>.</p></div>
 <div class="paragraph"><p><strong>The dive plan details</strong></p></div>
 <div class="paragraph"><p>On the bottom right of the dive planner, under <em>Dive Plan Details</em>, the exact details
 of the dive plan are provided. These details may be modified by checking any of the
-options under the <em>Dive Notes</em> section of the dive planner, immediately to the left
-of the <em>Dive Plan Details</em>. If a <em>Verbatim diveplan</em>
+options under the <em>Notes</em> section of the dive planner, immediately to the left
+of the <em>Dive Plan Details</em>. If a <em>Verbatim dive plan</em>
 is requested, a detailed sentence-level explanation of the dive plan is given. If any
 of the management specifications have been exceeded during the planning, a warning
 message is printed underneath the dive plan information.</p></div>
@@ -4289,20 +4739,44 @@ level is indicated in the <em>Dive Plan Details</em>. This duration INCLUDES the
 time to get to that level. However, if the <em>Display transition in deco</em> option is checked,
 the transitions are shown separately from the segment durations at a particular level.</p></div>
 </div>
+</div>
 <div class="sect2">
-<h3 id="_planning_ccr_dives">13.3. Planning CCR dives</h3>
+<h3 id="_planning_pscr_dives">13.3. Planning pSCR dives</h3>
+<div class="paragraph"><p>To plan a dive using a passive semi-closed rebreather (pSCR), select <em>pSCR</em> rather than
+<em>Open circuit</em> in the dropdown list.
+The parameters of the pSCR dive can be set by selecting  <em>File &#8594;   Preferences &#8594;   Graph</em>
+from the main menu, where the gas consumption calculation takes into account the pSCR dump
+ratio (default 10:1) as well as the metabolism rate. The calculation also takes the oxygen drop
+accross the mouthpiece of the rebreather into account. If the
+pO<sub>2</sub> drops below what is considered a save value, a warning appears in the <em>Dive plan
+details</em>. A typical pSCR configuration is with a single cylinder and one or more bail-out
+cylinders. Therefore the setup of the <em>Available gases</em> and the <em>Dive planner points</em> tables
+are very similar to that of a CCR dive plan, described below. However, no oxygen setpoints
+are specified for pSCR dives. Below is a dive plan for a pSCR dive. The dive is comparable
+to that of the CCR dive below, but note the longer ascent duration due to the lower oxygen
+in the loop due to the oxygen drop across the mouthpiece of the pSCR equipment.</p></div>
+<div class="imageblock" style="text-align:center;">
+<div class="content">
+<img src="images/Planner_pSCR1_f20.jpg" alt="FIGURE: Planning a pSCR dive: setup" />
+</div>
+</div>
+</div>
+<div class="sect2">
+<h3 id="_planning_ccr_dives">13.4. Planning CCR dives</h3>
 <div class="paragraph"><p>To plan a dive using a closed circuit rebreather, select the <em>CCR</em> option in the dropdown
 list, circled in blue in the image below.</p></div>
 <div class="paragraph"><p><strong>Available gases</strong>: In the <em>Available gases</em> table, enter the cylinder information for the
 diluent cylinder and for any bail-out cylinders. Do NOT enter the information for the oxygen
 cylinder since it is implied when the <em>CCR</em> dropdown selection is made.</p></div>
-<div class="paragraph"><p><strong>Entering setpoints</strong>: Specify a default setpoint in the Preferences tab, by selecting <em>File &#8594;  Preferences &#8594;  Graph</em> from the main menu. All user-entered segments in the <em>Dive planner points</em> table
+<div class="paragraph"><p><strong>Entering setpoints</strong>: Specify a default setpoint in the Preferences tab, by selecting <em>File &#8594;  Preferences &#8594;  Graph</em> from
+the main menu. All user-entered segments in the <em>Dive planner points</em> table
 use the default setpoint value. Then, different setpoints can be specified for dive segments
 in the <em>Dive planner points</em> table. A zero setpoint
 means the diver bails out to open circuit mode for that segment. The decompression is always calculated
 using the setpoint of the last manually entered segment. So, to plan a bail out ascent for a
 CCR dive, add a one-minute dive segment to the end with a setpoint value of 0. The decompression
-algorithm does not switch deco-gases automatically while in CCR mode (i.e. when a positive setpoint is specified) but, of course, this is calculated for bail out ascents.</p></div>
+algorithm does not switch deco-gases automatically while in CCR mode (i.e. when a positive setpoint is specified) but,
+of course, this is calculated for bail out ascents.</p></div>
 <div class="paragraph"><p>The dive profile for a CCR dive may look something like the image below.</p></div>
 <div class="imageblock" style="text-align:center;">
 <div class="content">
@@ -4313,27 +4787,6 @@ algorithm does not switch deco-gases automatically while in CCR mode (i.e. when
 so gas consumptions of 0 litres are the norm.</p></div>
 </div>
 <div class="sect2">
-<h3 id="_planning_pscr_dives">13.4. Planning pSCR dives</h3>
-<div class="paragraph"><p>To plan a dive using a passive semi-closed rebreather (pSCR), select <em>pSCR</em> rather than
-<em>Open circuit</em> in the dropdown list.
-The parameters of the pSCR diver can be set by selecting  <em>File &#8594;   Preferences &#8594;   Graph</em>
-from the main menu, where the gas consumption calculation takes into account the pSCR dump
-ratio (default 10:1) as well as the metabolism rate. The calculation also takes the oxygen drop
-accross the mouthpiece of the rebreather into account. If the
-pO<sub>2</sub> drops below what is considered a save value, a warning appears in the <em>Dive plan
-details</em>. A typical pSCR configuration is with a single cylinder and one or more bail-out
-cylinders. Therefore the setup of the <em>Available gases</em> and the <em>Dive planner points</em> tables
-are very similar to that of a CCR dive plan, described above. However, no oxygen setpoints
-are specified for pSCR dives. Below is a dive plan for a pSCR dive. The dive is comparable
-to that of the CCR dive above, but note the longer ascent duration due to the lower oxygen
-in the loop due to the oxygen drop across the mouthpiece of the pSCR equipment.</p></div>
-<div class="imageblock" style="text-align:center;">
-<div class="content">
-<img src="images/Planner_pSCR1_f20.jpg" alt="FIGURE: Planning a pSCR dive: setup" />
-</div>
-</div>
-</div>
-<div class="sect2">
 <h3 id="S_Replan">13.5. Modifying an existing dive plan</h3>
 <div class="paragraph"><p>Normally, when a dive plan has been saved, it is accessible from the <strong>Dive List</strong>, like any
 other dive log. Within the <strong>Dive List</strong> there is not a way to change a saved dive plan.
@@ -4370,7 +4823,7 @@ for wet notes. Alternatively one can cut and paste the <em>Dive Plan Details</em
 inclusion in a text file or word processing document.</p></div>
 <div class="paragraph"><p>Dive plans have many characteristics in common with dive logs (dive profile, dive notes, etc).
 After a dive plan has been saved, the dive details and gas calculations are saved in
-the <strong>Dive Notes</strong> tab. While a dive plan is being designed, it can be printed using
+the <strong>Notes</strong> tab. While a dive plan is being designed, it can be printed using
 the <em>Print</em> button in the dive planner. This prints the dive details and gas calculations
 in the <em>Dive Plan Details</em> panel of the dive planner. However, after the plan has been saved, it is
 represented in a way very similar to a dive log and the gas calculations cannot be
@@ -4403,11 +4856,21 @@ dealing with the appropriate operations.</p></div>
 </li>
 <li>
 <p>
+<em>Open cloud storage</em> - Open the dive log previously saved in <a href="#S_Cloud_storage"><em>Cloud storage</em></a>.
+</p>
+</li>
+<li>
+<p>
 <em>Save</em> - Save the dive logbook that is currently open.
 </p>
 </li>
 <li>
 <p>
+<em>Save to cloud storage</em> - Save the current dive log to <a href="#S_Cloud_storage"><em>Cloud storage</em></a>.
+</p>
+</li>
+<li>
+<p>
 <em>Save as</em> - Save the current logbook under a different file name.
 </p>
 </li>
@@ -4434,6 +4897,12 @@ dealing with the appropriate operations.</p></div>
 </li>
 <li>
 <p>
+<a href="#S_FindMovedImages"><em>Find moved images</em></a> - If photos taken during dives have been moved to
+      a different disk or directory, locate them and link them to the appropriate dives.
+</p>
+</li>
+<li>
+<p>
 <a href="#S_Configure"><em>Configure dive computer</em></a> - Edit the configuration of a dive computer.
 </p>
 </li>
@@ -4483,12 +4952,17 @@ dealing with the appropriate operations.</p></div>
 </li>
 <li>
 <p>
+<em>Edit dive</em> - Edit a dive of which the profile was entered by hande and not from a dive computer.
+</p>
+</li>
+<li>
+<p>
 <a href="#S_DivePlanner"><em>Plan Dive</em></a> - This feature allows the planning of dives.
 </p>
 </li>
 <li>
 <p>
-<a href="#S_Replan"><em>Re-plan dive</em></a> - Edit a dive plan that has been saved into the <strong>Dive List</strong>.
+<a href="#S_Replan"><em>Edit dive in planner</em></a> - Edit a dive plan that has been saved into the <strong>Dive List</strong>.
 </p>
 </li>
 <li>
@@ -4548,7 +5022,7 @@ dealing with the appropriate operations.</p></div>
 </li>
 <li>
 <p>
-<a href="#S_ViewPanels"><em>Info</em></a> - View only the <strong>Dive Notes</strong> panel.
+<a href="#S_ViewPanels"><em>Info</em></a> - View only the <strong>Notes</strong> panel.
 </p>
 </li>
 <li>
@@ -4564,7 +5038,8 @@ dealing with the appropriate operations.</p></div>
 </li>
 <li>
 <p>
-<em>Prev DC</em> - Switch to previous dive computer.
+<em>Prev DC</em> - If a single dive was logged from more than one dive computer, switch to data from
+   previous dive computer.
 </p>
 </li>
 <li>
@@ -4580,7 +5055,17 @@ dealing with the appropriate operations.</p></div>
 </ul></div>
 </div>
 <div class="sect2">
-<h3 id="_help">14.5. Help</h3>
+<h3 id="_share_on">14.5. Share on</h3>
+<div class="ulist"><ul>
+<li>
+<p>
+<a href="#S_Facebook"><em>Facebook</em></a> - Share the currently selected dive on your Facebook timeline.
+</p>
+</li>
+</ul></div>
+</div>
+<div class="sect2">
+<h3 id="_help">14.6. Help</h3>
 <div class="ulist"><ul>
 <li>
 <p>
@@ -4596,7 +5081,8 @@ dealing with the appropriate operations.</p></div>
 </li>
 <li>
 <p>
-<a href="#S_UserSurvey"><em>User survey</em></a>  - Help to make <em>Subsurface</em> even better by taking part in our user survey.
+<a href="#S_UserSurvey"><em>User survey</em></a>  - Help to make <em>Subsurface</em> even better by taking part in our user survey
+  or by completing another survey if your diving habits have changed.
 </p>
 </li>
 <li>
@@ -4620,7 +5106,7 @@ dealing with the appropriate operations.</p></div>
 </td>
 <td class="content">The operating system of the desktop computer needs the appropriate drivers in
 order to communicate with the dive computer in whichever way the dive
-computer prefers (e.g. bluetooth, USB, infra-red).</td>
+computer prefers (e.g. Bluetooth, USB, infra-red).</td>
 </tr></table>
 </div>
 <div class="ulist"><ul>
@@ -4757,13 +5243,13 @@ port, the dive computer interface can connect and one should be able to import
 dives.</p></div>
 </div>
 <div class="sect2">
-<h3 id="S_HowFindBluetoothDeviceName">15.3. Setting up bluetooth enabled devices</h3>
+<h3 id="S_HowFindBluetoothDeviceName">15.3. Manually setting up Bluetooth enabled devices</h3>
 <div class="admonitionblock">
 <table><tr>
 <td class="icon">
 <img src="images/icons/bluetooth.jpg" alt="Note" />
 </td>
-<td class="content">For dive computers communicating through bluetooth like the Heinrichs
+<td class="content">For dive computers communicating through Bluetooth like the Heinrichs
 Weikamp Frog or the Shearwater Predator and Petrel there is a
 different procedure to get the devices name to communicate with
 <em>Subsurface</em>. Follow these steps:</td>
@@ -4786,75 +5272,229 @@ manufacturer&#8217;s user guide. When using a Shearwater Predator/Petrel, select
 </p>
 </li>
 </ul></div>
-<div class="paragraph"><div class="title">On Windows:</div><p>Bluetooth is most likely already enabled. For pairing with the dive computer choose
+<div class="sect3">
+<h4 id="_on_windows_2">15.3.1. On Windows:</h4>
+<div class="paragraph"><p>Bluetooth is most likely already enabled. For pairing with the dive computer choose
 <em>Control Panel &#8594;  Bluetooth Devices &#8594;  Add Wireless Device</em>.
-This should bring up a dialog showing your dive computer (in Bluetooth mode) and
-allowing pairing. Right click on it and choose <em>Propertie s&#8594;  COM
+This should bring up a dialog showing your dive computer (which should be in Bluetooth mode) and
+allowing pairing. Right click on it and choose <em>Properties&#8594;  COM
 Ports</em> to identify the port used for your dive computer. If there are several
 ports listed, use the one saying "Outgoing" instead of "Incoming".</p></div>
 <div class="paragraph"><p>For downloading to <em>Subsurface</em>, the <em>Subsurface</em> drop-down list should contain
 this COM port already. If not, enter it manually.</p></div>
 <div class="paragraph"><p>Note: If there are issues afterwards when downloading from the dive computer using
 other software, remove the existing pairing with the dive computer.</p></div>
-<div class="paragraph"><div class="title">On MacOS:</div><p>Click on the Bluetooth symbol in the menu bar and select <em>Set up
+</div>
+<div class="sect3">
+<h4 id="_on_macos">15.3.2. On MacOS:</h4>
+<div class="paragraph"><p>Click on the Bluetooth symbol in the menu bar and select <em>Set up
 Bluetooth Device&#8230;</em>. The dive computer should then show up in the list of devices. Select it and go
 through the pairing process. This step should only be needed once for
 initial setup.</p></div>
 <div class="paragraph"><p>Once the pairing is completed the correct device is shown in the
 <em>Device or Mount Point</em> drop-down in the <em>Subsurface</em> <strong>Import</strong> dialog.</p></div>
-<div class="paragraph"><div class="title">On Linux</div><p>Ensure Bluetooth is enabled on the <em>Subsurface</em> computer.
+</div>
+<div class="sect3">
+<h4 id="_on_linux">15.3.3. On Linux</h4>
+<div class="paragraph"><p>Ensure Bluetooth is enabled on the <em>Subsurface</em> computer.
 On most common distributions this should be true out of the box and
 pairing should be straight forward. For instance, Gnome3 shows a
-Bluetooth icon in the upper right corner of the desktop where one selects <em>Set
-up New Device</em>. This should show a dialog where one can select the
-dive computer (which already should be in Bluetooth mode) and pair it.
-If a PIN is required, try manually setting <em>0000</em>.</p></div>
-<div class="paragraph"><p>In the rare cases where the above is not true, then
-depending on your system, try <code>initd</code> or <code>systemd</code>. This might be different
-and also involve loading modules specific to your hardware. In case your system
-is running <code>systemd</code>, manually run <code>systemctl start bluetooth.service</code> to
-enable it, in case of <code>initd</code>, run something like <code>rc.config start bluetoothd</code> or
-<code>/etc/init.d/bluetooth start</code>.</p></div>
-<div class="paragraph"><p>One may also use a manual approach by using such commands:</p></div>
+Bluetooth icon on the right of the toolbar at the top of the screen.
+Users have reported difficulties with some Bluetooth controllers.  If you have an onboard controller,
+try that first.  It is simplest if you remove any USB Bluetooth dongles.  If you have a USB dongle that
+came with your dive computer, try that before any others.</p></div>
+<div class="paragraph"><p>Setting up a connection to download dives from your Bluetooth-enabled device, such as the
+<em>Shearwater Petrel</em>, is not yet an automated process and will generally require the command prompt.
+It is essentially a three step process.</p></div>
 <div class="ulist"><ul>
 <li>
 <p>
-<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.
+Enable the Bluetooth controller and pair your dive computer
 </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
+Establish an RFCOMM connection
 </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>
+Download the dives with Subsurface
 </p>
 </li>
 </ul></div>
-<div class="paragraph"><p>Unfortunately on Linux binding to a communication device has to be done
-manually by running:</p></div>
+<div class="paragraph"><p>Ensure the dive computer is in upload mode. On the <em>Shearwater Petrel</em> and <em>Petrel 2</em>,
+cycle through the menu, select <em>Dive Log</em>, then <em>Upload Log</em>.  The display will read <em>Initializing</em>, then
+<em>Wait PC 3:00</em> and will countdown.  Once the connection is established, the display reads <em>Wait CMD &#8230;</em>
+and the countdown continues. When downloading the dive from Subsurface, the display reads <em>Sending</em> then
+<em>Sent Dive</em>.</p></div>
+<div class="paragraph"><p>To establish the connection, establish root access through <code>sudo</code> or <code>su</code>.
+The correct permission is required to download the dives in the computer. On most Linux systems this means becoming
+a member of the dialout group (This is identical as for many dive computers using a Linux USB port, described
+in the previous section). On the command terminal, enter:</p></div>
+<div class="paragraph"><p><code>sudo usermod -a -G dialout username</code></p></div>
+<div class="paragraph"><p>Then log out and log in for the change to take effect.</p></div>
+<div class="sect4">
+<h5 id="_enabling_the_bluetooth_controller_and_pairing_your_dive_computer">Enabling the Bluetooth controller and pairing your dive computer</h5>
+<div class="paragraph"><p>Attempt to set up the Bluetooth controller and pair your dive computer using the graphical
+environment of the operating system. After setting the dive computer to upload mode, click the Bluetooth icon in the system tray
+and select <em>Add new device</em>. The dive computer should appear. If asked for a password, enter 0000.
+Write down or copy the MAC address of your dive computer - this needed later and should be in the form  00:11:22:33:44:55.</p></div>
+<div class="paragraph"><p>If the graphical method didn&#8217;t work, pair the device from the command line. Open a terminal
+and use <code>hciconfig</code> to check the Bluetooth controller status</p></div>
+<div class="literalblock">
+<div class="content">
+<pre><code>$ hciconfig
+hci0:   Type: BR/EDR  Bus: USB
+        BD Address: 01:23:45:67:89:AB  ACL MTU: 310:10  SCO MTU: 64:8
+        *DOWN*
+        RX bytes:504 acl:0 sco:0 events:22 errors:0
+        TX bytes:92 acl:0 sco:0 commands:21 errors:0</code></pre>
+</div></div>
+<div class="paragraph"><p>This indicates a Bluetooth controller with MAC address 01:23:45:67:89:AB, connected as hci0.
+Its status is <em>DOWN</em>, i.e. not powered.  Additional controllers will appear as hci1, etc.
+If there is not a Bluetooth dongle plugged in upon booting the computer, hci0 is probably the onboard.
+Now power on the controller and enable authentication:</p></div>
+<div class="literalblock">
+<div class="content">
+<pre><code>sudo hciconfig hci0 up auth+  (enter password when prompted)
+hciconfig
+hci0:  Type: BR/EDR  Bus: USB
+        BD Address: 01:23:45:67:89:AB  ACL MTU: 310:10  SCO MTU: 64:8
+        *UP RUNNING PSCAN AUTH*
+        RX bytes:1026 acl:0 sco:0 events:47 errors:0
+        TX bytes:449 acl:0 sco:0 commands:46 errors:0</code></pre>
+</div></div>
+<div class="paragraph"><p>Check that the status now includes <code><em>UP</em>, <em>RUNNING</em> AND <em>AUTH</em></code>.</p></div>
+<div class="paragraph"><p>If there are multiple controllers running, it&#8217;s easiest to off the unused controller(s). For example, for <code>hci1</code>:</p></div>
+<div class="literalblock">
+<div class="content">
+<pre><code>sudo hciconfig hci1 down</code></pre>
+</div></div>
+<div class="paragraph"><p>Next step is to <em>trust</em> and <em>pair</em> the dive computer. On distros with Bluez 5, such as Fedora 22,
+one can use a tool called <code>blutootctl</code>, which will bring up its own command prompt.</p></div>
+<div class="literalblock">
+<div class="content">
+<pre><code>bluetoothctl
+[NEW] Controller 01:23:45:67:89:AB localhost.localdomain [default]
+[bluetooth]# agent on
+Agent registered
+[bluetooth]# default-agent
+Default agent request successful
+[bluetooth]# scan on                        &lt;----now set your dive computer to upload mode
+Discovery started
+[CHG] Controller 01:23:45:67:89:AB Discovering: yes
+[NEW] Device 00:11:22:33:44:55 Petrel
+[bluetooth]# trust 00:11:22:33:44:55        &lt;----you can use the tab key to autocomplete the MAC address
+[CHG] Device 00:11:22:33:44:55 Trusted: yes
+Changing 00:11:22:33:44:55 trust succeeded
+[bluetooth]# pair 00:11:22:33:44:55
+Attempting to pair with 00:11:22:33:44:55
+[CHG] Device 00:11:22:33:44:55 Connected: yes
+[CHG] Device 00:11:22:33:44:55 UUIDs: 00001101-0000-1000-8000-0089abc12345
+[CHG] Device 00:11:22:33:44:55 Paired: yes
+Pairing successful
+[CHG] Device 00:11:22:33:44:55 Connected: no</code></pre>
+</div></div>
+<div class="paragraph"><p>If asked for a password, enter 0000. It&#8217;s ok if the last line says <em>Connected: no</em>. The important part
+is the line above, <code>Pairing successful</code>.</p></div>
+<div class="paragraph"><p>If the system has Bluez version 4 (e.g. Ubuntu 12.04 through to 15.04), there is probably not a
+<code>bluetoothctl</code>, but  a script called <code>bluez-simple-agent</code> or just <code>simple-agent</code>.</p></div>
+<div class="literalblock">
+<div class="content">
+<pre><code>hcitool -i hci0 scanning
+Scanning ...
+        00:11:22:33:44:55       Petrel
+        bluez-simple-agent hci0 00:11:22:33:44:55</code></pre>
+</div></div>
+<div class="paragraph"><p>Once ther dive computer is pired, set up the RFCOMM connection</p></div>
+</div>
+<div class="sect4">
+<h5 id="_establishing_the_rfcomm_connection">Establishing the RFCOMM connection</h5>
+<div class="paragraph"><p>The command to establish an RFCOMM connection is:</p></div>
+<div class="paragraph"><p><code>sudo rfcomm -i &lt;controller&gt; connect &lt;dev&gt; &lt;bdaddr&gt; [channel]</code></p></div>
 <div class="ulist"><ul>
 <li>
 <p>
-<code>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.
+<code>&lt;controller&gt;</code> is the Bluetooth controller, <code>hci0</code>.
+</p>
+</li>
+<li>
+<p>
+<code>&lt;dev&gt;</code> is the RFCOMM device file, <code>rfcomm0</code>
+</p>
+</li>
+<li>
+<p>
+<code>&lt;bdaddr&gt;</code> is the dive computer&#8217;s MAC address, <code>00:11:22:33:44:55</code>
+</p>
+</li>
+<li>
+<p>
+<code>[channel]</code> is the dive computer&#8217;s Bluetooth channel we need to connect to.
 </p>
 </li>
 </ul></div>
-<div class="paragraph"><p>For downloading dives in <em>Subsurface</em> specify the device name connected to the MAC
-address in the last step above, e.g. <em>/dev/rfcomm0</em>.</p></div>
+<div class="paragraph"><p>If one omits it, channel 1 is assumed.  Based on a limited number of user reports,
+the appropriate channel for the dive computer is probably:</p></div>
+<div class="ulist"><ul>
+<li>
+<p>
+<em>Shearwater Petrel 2</em>: channel 5
+</p>
+</li>
+<li>
+<p>
+<em>Shearwater Petrel 1</em>: channel 1
+</p>
+</li>
+<li>
+<p>
+<em>Heinrichs-Weikamp OSTC Sport</em>: channel 1
+</p>
+</li>
+</ul></div>
+<div class="paragraph"><p>E.g. to connect a <em>Shearwater Petrel 2</em>, set the dive computer to upload mode and enter:</p></div>
+<div class="literalblock">
+<div class="content">
+<pre><code>sudo rfcomm -i hci0 connect rfcomm0 00:11:22:33:44:55 5 (enter a password, probably 0000, when prompted)</code></pre>
+</div></div>
+<div class="paragraph"><p>This gives the response:</p></div>
+<div class="literalblock">
+<div class="content">
+<pre><code>Connected /dev/rfcomm0 to 00:11:22:33:44:55 on channel 5
+Press CTRL-C for hangup</code></pre>
+</div></div>
+<div class="paragraph"><p>To connect a _Shearwater Petrel 1+ or + HW OSTC Sport+, set the dive computer to upload mode and enter:</p></div>
+<div class="literalblock">
+<div class="content">
+<pre><code>sudo rfcomm -i hci0 connect rfcomm0 00:11:22:33:44:55   (enter a password, probably 0000, when prompted)
+Connected /dev/rfcomm0 to 00:11:22:33:44:55 on channel 1
+Press CTRL-C for hangup</code></pre>
+</div></div>
+<div class="paragraph"><p>If the specific channel the dive computer needs is not known, or the channel in the list above doesn&#8217;t
+work, the command <code>sdptool records</code> should help determine the appropriate channel. The output
+below is for a <em>Shearwater Petrel 2</em>.</p></div>
+<div class="literalblock">
+<div class="content">
+<pre><code>sdptool -i hci0 records 00:11:22:33:44:55
+Service Name: Serial Port
+Service RecHandle: 0x10000
+Service Class ID List:
+        "Serial Port" (0x1101)
+        Protocol Descriptor List:
+        "L2CAP" (0x0100)
+        "RFCOMM" (0x0003)
+        Channel: 5</code></pre>
+</div></div>
+<div class="paragraph"><p>For a Bluetooth dive computer not in the list above, or if the channel listed is not correct, please
+let the Subsurface developers know on the user forum or the developer mailing list <em>subsurface@subsurface-divelog.org</em>.</p></div>
+</div>
+<div class="sect4">
+<h5 id="_download_the_dives_with_subsurface">Download the dives with Subsurface</h5>
+<div class="paragraph"><p>After establishing the RFCOMM connection and while the dive computer&#8217;s upload mode countdown is still running, go to_Subsurface_, select <em>Import&#8594;Import from dive computer</em> and enter appropriate Vendor (e.g. <em>Shearwater</em>), Dive Computer (<em>Petrel</em>), Device or Mount Point (<em>/dev/rfcomm0</em>) and click <em>Download</em>.</p></div>
+</div>
+</div>
 </div>
 </div>
 </div>
@@ -4925,7 +5565,9 @@ from the console as follows:
 dive computer and download dive information.</p></div>
 <div class="paragraph"><p>Under Windows, a similar situation exists. Drivers for the MCS7780 are
 available from some Internet web sites e.g.
-<a href="http://www.drivers-download.com/Drv/MosChip/MCS7780/">www.drivers-download.com</a>.</p></div>
+<a href="http://www.drivers-download.com/Drv/MosChip/MCS7780/">www.drivers-download.com</a>. Windows-based IrDA
+drivers for the Uwatec can also be downloaded from the ScubaPro web site, drivers being located on
+the download page for the ScubaPro SmartTrak software.</p></div>
 <div class="paragraph"><p>For the Apple Mac, IrDA communication via the MCS7780 link is not
 available for OSX 10.6 or higher.</p></div>
 </div>
@@ -4965,38 +5607,15 @@ factors in the <em>Graph Settings</em> in <em>Subsurface</em> to generate a deco
 </div>
 </div>
 <div class="sect2">
-<h3 id="_importing_from_shearwater_predator_using_bluetooth">16.5. Importing from Shearwater Predator using Bluetooth</h3>
+<h3 id="_importing_from_shearwater_predator_petrel_using_bluetooth">16.5. Importing from Shearwater Predator/Petrel using Bluetooth</h3>
 <div class="admonitionblock">
 <table><tr>
 <td class="icon">
 <img src="images/icons/predator.jpg" alt="Note" />
 </td>
-<td class="content">Using a Shearwater Predator one may be able to pair Bluetooth but then encounter
-issues when downloading, showing errors like <em>Slip RX: unexp. SLIP END</em> on the
-Predator.
-This might also arise when using other dive log software and operating
-systems other than Linux. We have no detailed idea about the source and how to fix
-this, but it is reported to be solved sometimes by one of these steps:</td>
+<td class="content">Specific instructions for downloading dives using Bluetooth are  given in the section above, <a href="#S_Bluetooth"><em>Connecting Subsurface to a Bluetooth-enabled dive computer</em></a>.</td>
 </tr></table>
 </div>
-<div class="ulist"><ul>
-<li>
-<p>
-use the Bluetooth dongle which came with the Shearwater Predator instead of
-   the built-in one of the <em>Subsurface</em> computer
-</p>
-</li>
-<li>
-<p>
-switch to different Bluetooth drivers for the same hardware
-</p>
-</li>
-<li>
-<p>
-switch off WiFi while using Bluetooth
-</p>
-</li>
-</ul></div>
 </div>
 <div class="sect2">
 <h3 id="S_PoseidonMkVI">16.6. Importing from Poseidon MkVI Discovery</h3>
@@ -5035,7 +5654,7 @@ Redbook format dive log (file with .cvsr extension). This is a compressed
 <div class="paragraph"><p><em>Subsurface</em> accesses the .txt and the .csv files to obtain dive log information.</p></div>
 </div>
 <div class="sect2">
-<h3 id="_importing_from_apd_inspiration_ccr">16.7. Importing from APD Inspiration CCR</h3>
+<h3 id="_importing_from_apd_inspiration_evolution_ccr">16.7. Importing from APD Inspiration/Evolution CCR</h3>
 <div class="admonitionblock">
 <table><tr>
 <td class="icon">
@@ -5052,6 +5671,11 @@ APD inspiration dive logs are imported into <em>Subsurface</em> as follows:</td>
 <div class="ulist"><ul>
 <li>
 <p>
+Download the dive using <em>AP Communicator</em>.
+</p>
+</li>
+<li>
+<p>
 Open a dive within the <em>AP Log Viewer</em>.
 </p>
 </li>
@@ -5062,18 +5686,18 @@ Select the tab at the top of the screen, entitled "<em>Data</em>".
 </li>
 <li>
 <p>
-If the raw dive log data show on the screen, click on "<em>Copy to Clipboard</em>".
+With the raw dive log data show on the screen, click on "<em>Copy to Clipboard</em>".
 </p>
 </li>
 <li>
 <p>
-Open a text editor, e.g. Notepad (Windows), TextWrangler (Mac).
+Open a text editor, e.g. Notepad (Windows) or TextWrangler (Mac).
 </p>
 </li>
 <li>
 <p>
 Copy the contents of the clipboard into the text editor and save the text file
-  with a filename extension of .CSV
+  with a filename extension of <em>.apd</em>
 </p>
 </li>
 <li>
@@ -5083,28 +5707,43 @@ Within <em>Subsurface</em>, select <em>Import &#8594;  Import log files</em> to
 </li>
 <li>
 <p>
-In the dropdown list towards the bottom right of the dialogue, select "<em>CSV files</em>".
+In the dropdown list towards the bottom right of the dialogue (labled <em>Filter:</em>), select "APD log viewer".
 </p>
 </li>
 <li>
 <p>
-On the list of file names select the .CSV file that has been created above. An import
-  dialogue opens.
-</p>
-</li>
-<li>
-<p>
-In the dropdown list on the top left labeled '<em>Pre-configured imports</em>",
-  select <em>APD Log Viewer</em>.
-</p>
-</li>
-<li>
-<p>
-Ensure the other settings for the ADP dive log are appropriate, then select <em>OK</em>.
+On the list of file names select the <em>.apd</em> file that has been created above. An import
+  dialogue opens indicating the default settings for the data in the <em>.apd</em> file. If any changes are required,
+  do this as for <a href="#S_ImportingCSVDives">CSV imports</a>.
 </p>
 </li>
 </ul></div>
-<div class="paragraph"><p>The APD dive log will appear within <em>Subsurface</em>.</p></div>
+<div class="imageblock" style="text-align:center;">
+<div class="content">
+<img src="images/APD_CSVimportF22.jpg" alt="Figure: APD log viewer import" />
+</div>
+</div>
+<div class="ulist"><ul>
+<li>
+<p>
+The top left hand dropdown box in the import panel allows one to select the APD dive computer
+  for which the dive log needs to be imported. The default it is DC1, <em>i.e.</em> the
+  first of the two dive computers the APD uses. It is possible to sequentially
+  import the data for both dive computers by first importing CD1 and then DC2.(<strong>Hint</strong>: The logs
+  for the two dive computers are viewed by selecting <em>View  &#8594;  Next DC</em> from
+  the Main Menu after the uploading has been completed)
+</p>
+</li>
+<li>
+<p>
+Click the <em>Ok</em> button at the bottom of the import panel.
+</p>
+</li>
+</ul></div>
+<div class="paragraph"><p>The APD dive log will appear within <em>Subsurface</em>. The dive computer-generated ceiling
+generated by the Inspiration can be viewed by selecting the appropriate
+button on the left of the <strong>Dive Profile</strong>. Cylinder pressure data are not logged
+by the APD equipment but can be manually entered in the <em>Equipment</em> Tab.</p></div>
 </div>
 </div>
 </div>
@@ -5308,7 +5947,7 @@ The dives are now exported to the file DM4.bak (or DM5.bak)
 <div class="admonitionblock" id="Atomic_Export">
 <table><tr>
 <td class="icon">
-<img src="./images/icons/note.png" alt="Note" />
+<img src="images/icons/atomiclogo.jpg" alt="Note" />
 </td>
 <td class="content">Atomic Logbook is a Windows software by Atomic Aquatics. It allows
 downloading of dive information from Cobalt and Cobalt 2 dive computers.
@@ -5362,45 +6001,57 @@ The password for accessing the .zip file is <em>mares</em>.
 </ol></div>
 </div>
 <div class="sect2">
-<h3 id="S_ImportingDivingLog">17.4. Exporting from <strong>DivingLog 5.0</strong></h3>
+<h3 id="S_ImportingDivingLog">17.4. Exporting from <strong>DivingLog 5.0 and 6.0</strong></h3>
 <div class="admonitionblock">
 <table><tr>
 <td class="icon">
 <img src="images/icons/divingloglogo.jpg" alt="Note" />
 </td>
-<td class="content">Unfortunately DivingLog XML files give us no
-indication on the preferences set on one&#8217;s system. So in order for
-<em>Subsurface</em> to be able to successfully import XML files from DivingLog
-one first needs to ensure that DivingLog is configured
-to use the Metric system (one can easily change this within Diving Log by
-selecting <em>File &#8594;  Preferences &#8594; Units and Language</em> by clicking the <em>Metric</em>
-button). Then do the following:</td>
+<td class="content">The best way to bring your logs from DivingLog to Subsurface is to
+convert the whole database. This is because other export formats do not
+include all the details, and we would lack e.g. gas switches and
+information of what units are used. With database import, all this
+information is included and readily available for us.</td>
 </tr></table>
 </div>
+<div class="paragraph"><p>To transfer all files from DivingLog to Subsurface, do the following:</p></div>
 <div class="olist arabic"><ol class="arabic">
 <li>
 <p>
-In DivingLog open the <em>File &#8594;  Export &#8594;  XML</em> menu
+In DivingLog open the <em>File &#8594;  Export &#8594;  SQLite</em> menu
 </p>
 </li>
 <li>
 <p>
-Select the dives to export
+Select <em>Settings</em> button
 </p>
 </li>
 <li>
 <p>
-Click on the export button and select the filename
+Set the <em>RTF2Plaintext</em> to <em>true</em>
+</p>
+</li>
+<li>
+<p>
+Close the Settings dialog
+</p>
+</li>
+<li>
+<p>
+Click <em>Export</em> button and select the filename
 </p>
 </li>
 </ol></div>
+<div class="paragraph"><p>Once this is done, open the saved database file with Subsurface and the
+dives are automatically converted to our own format. Last step to do is
+save the log file in Subsurface.</p></div>
 </div>
 </div>
 </div>
 <div class="sect1">
-<h2 id="S_Appendix_D">18. APPENDIX D: Exporting a spreadsheet to CSV format</h2>
+<h2 id="_appendix_d_exporting_a_spreadsheet_to_csv_format">18. APPENDIX D: Exporting a spreadsheet to CSV format</h2>
 <div class="sectionbody">
-<div class="paragraph"><p>Many divers keep a diving log in some form of a digital file, commonly a spreadsheet
+<div class="paragraph" id="S_Appendix_D"><p>Many divers keep a diving log in some form of a digital file, commonly a spreadsheet
 with various fields of information. These logs can be easily imported into <em>Subsurface</em> after the
 spreadsheet is converted in a .CSV file.
 This section explains the procedure to convert a diving logbook stored in a spreadsheet
@@ -5531,10 +6182,341 @@ Click <em>OK</em> twice.
 </div>
 </div>
 <div class="sect1">
-<h2 id="_appendix_e_faqs">19. APPENDIX E: FAQs.</h2>
+<h2 id="S_APPENDIX_E">19. APPENDIX E: Writing a custom print template</h2>
+<div class="sectionbody">
+<div class="paragraph"><p><em>Subsurface</em> provides a mechanism to create or modify templates for printing dive logs in order to
+produce customised printouts of dive logs. Templates, written in HTML as well as a simple
+Grantlee instruction set, are rendered to the print device by <em>Subsurface</em>.</p></div>
+<div class="paragraph"><p>Templates are accessed using the print dialogue (see image <strong>B</strong> below).</p></div>
+<div class="imageblock" style="text-align:center;">
+<div class="content">
+<img src="images/Print1_f22.jpg" alt="FIGURE: Print dialogue" />
+</div>
+</div>
+<div class="paragraph"><p>The buttons under the <em>Template</em> dropdown box allows one to <em>Edit</em>, <em>Delete</em>,
+<em>Import</em> and to <em>Export</em> templates (see image <strong>A</strong> above). New or modified templates are stored as HTML
+files in the same directory as the dive log being processed. In order to create or modify
+a template, select one of the templates from the template dropdown list in the print dialogue
+(see image <strong>B</strong> above). Choose an existing template that resembles the final desired printout. Then select <em>Edit</em>.</p></div>
+<div class="paragraph"><p>The Edit Panel comprises three tabs:</p></div>
+<div class="imageblock" style="text-align:center;">
+<div class="content">
+<img src="images/Template1_f22.jpg" alt="FIGURE: template edit dialogue" />
+</div>
+</div>
+<div class="paragraph"><p>1) The <em>Style</em> tab (image <strong>A</strong> above) controls the font, line spacing and colour template used for printing the dive log.
+   The style attributes are editable. Choose one of the four colour palets used for colour printing.</p></div>
+<div class="paragraph"><p>2) The <em>Colors</em> tab (image <strong>B</strong> above) allows editing the colours used for printing the dive log. The colours are highly
+   customisable: the <em>Edit</em> buttons in the <em>Colors</em> tab allows choosing abritrary colours for different
+   components of the dive log printout.</p></div>
+<div class="paragraph"><p>3) The <em>Template</em> tab of the Edit Panel (see image below) allows creating a template using HTML as well as a few
+   Grantlee programming primitives. Grantlee provides the ability to create and format HTML code in
+   a highly simple but efficient way (see below). The HTML of the template can be edited and saved. The saved
+   template is stored in the same directory as the dive being processed. By default, a <em>Custom</em>
+   template is a skeleton with no specific print instructions. The informastion being printed
+   needs to be specified and formatted in the by replacing the section marked with:
+   "&lt;!-- Template must be filled -&#8594;". Writing HTML code with Grantlee instructions allows unlimited
+   freedom in determining what is printed an in which way it should be rendered.</p></div>
+<div class="imageblock" style="text-align:center;">
+<div class="content">
+<img src="images/Template2_f22.jpg" alt="FIGURE:Template tab" />
+</div>
+</div>
+<div class="paragraph"><p>One can adapt any of the existing templates and save it to the dive log directory. The standard templates (e.g. One dive, Six dives, Table) can be modified in this way. After completing the edits, use the <em>Export</em> button in the print
+dialogue to save the new template using a new template name.</p></div>
+<div class="paragraph"><p>To write a custom template the following elements must exist so that the template will be correctly handled and rendered.</p></div>
+<div class="sect2">
+<h3 id="_main_dive_loop">19.1. Main dive loop</h3>
+<div class="paragraph"><p><em>Subsurface</em> exports a dive list called (<strong>dives</strong>) to the <em>Grantlee</em> backend. It is possible to iterate over the list as follows:</p></div>
+<div class="literalblock">
+<div class="title">template.html</div>
+<div class="content">
+<pre><code>        {% for dive in dives %}
+                &lt;h1&gt; {{ dive.number }} &lt;/h1&gt;
+        {% endfor %}</code></pre>
+</div></div>
+<div class="literalblock">
+<div class="title">output.html</div>
+<div class="content">
+<pre><code>        &lt;h1&gt; 1 &lt;/h1&gt;
+        &lt;h1&gt; 2 &lt;/h1&gt;
+        &lt;h1&gt; 3 &lt;/h1&gt;</code></pre>
+</div></div>
+<div class="paragraph"><p>Additional information about <em>Grantlee</em> can be found <a href="http://www.grantlee.org/apidox/for_themers.html">here</a></p></div>
+</div>
+<div class="sect2">
+<h3 id="_grantlee_exported_variables">19.2. Grantlee exported variables</h3>
+<div class="paragraph"><p>Only a subset of the dive data is exported:</p></div>
+<div class="tableblock">
+<table rules="all"
+width="100%"
+frame="border"
+cellspacing="0" cellpadding="4">
+<col width="50%" />
+<col width="50%" />
+<tbody>
+<tr>
+<td align="left" valign="top"><p class="table"><strong>Name</strong></p></td>
+<td align="left" valign="top"><p class="table"><strong>Description</strong></p></td>
+</tr>
+<tr>
+<td align="left" valign="top"><p class="table">number</p></td>
+<td align="left" valign="top"><p class="table">(<strong>int</strong>) dive number</p></td>
+</tr>
+<tr>
+<td align="left" valign="top"><p class="table">id</p></td>
+<td align="left" valign="top"><p class="table">(<strong>int</strong>) unique dive ID, should be used to fetch the dive profile</p></td>
+</tr>
+<tr>
+<td align="left" valign="top"><p class="table">date</p></td>
+<td align="left" valign="top"><p class="table">(<strong>string</strong>) data of the dive</p></td>
+</tr>
+<tr>
+<td align="left" valign="top"><p class="table">time</p></td>
+<td align="left" valign="top"><p class="table">(<strong>string</strong>) time of the dive</p></td>
+</tr>
+<tr>
+<td align="left" valign="top"><p class="table">location</p></td>
+<td align="left" valign="top"><p class="table">(<strong>string</strong>) location of the dive</p></td>
+</tr>
+<tr>
+<td align="left" valign="top"><p class="table">duration</p></td>
+<td align="left" valign="top"><p class="table">(<strong>string</strong>) duration of the dive</p></td>
+</tr>
+<tr>
+<td align="left" valign="top"><p class="table">depth</p></td>
+<td align="left" valign="top"><p class="table">(<strong>string</strong>) depth of the dive</p></td>
+</tr>
+<tr>
+<td align="left" valign="top"><p class="table">divemaster</p></td>
+<td align="left" valign="top"><p class="table">(<strong>string</strong>) divemaster data</p></td>
+</tr>
+<tr>
+<td align="left" valign="top"><p class="table">buddy</p></td>
+<td align="left" valign="top"><p class="table">(<strong>string</strong>) buddy data</p></td>
+</tr>
+<tr>
+<td align="left" valign="top"><p class="table">airTemp</p></td>
+<td align="left" valign="top"><p class="table">(<strong>string</strong>) air temperature of dive</p></td>
+</tr>
+<tr>
+<td align="left" valign="top"><p class="table">waterTemp</p></td>
+<td align="left" valign="top"><p class="table">(<strong>string</strong>) water temperature of dive</p></td>
+</tr>
+<tr>
+<td align="left" valign="top"><p class="table">notes</p></td>
+<td align="left" valign="top"><p class="table">(<strong>string</strong>) dive notes</p></td>
+</tr>
+<tr>
+<td align="left" valign="top"><p class="table">rating</p></td>
+<td align="left" valign="top"><p class="table">(<strong>int</strong>) dive rating ranges from 0 to 5</p></td>
+</tr>
+<tr>
+<td align="left" valign="top"><p class="table">sac</p></td>
+<td align="left" valign="top"><p class="table">(<strong>string</strong>) sac value</p></td>
+</tr>
+<tr>
+<td align="left" valign="top"><p class="table">tags</p></td>
+<td align="left" valign="top"><p class="table">(<strong>string</strong>) all dive tags concatenate together</p></td>
+</tr>
+<tr>
+<td align="left" valign="top"><p class="table">gas</p></td>
+<td align="left" valign="top"><p class="table">(<strong>string</strong>) used gas cylinder</p></td>
+</tr>
+</tbody>
+</table>
+</div>
+<div class="paragraph"><p><em>Subsurface</em> also exports <strong>template_options</strong> data. This data must be used as <em>CSS</em> values to provide a dynamically
+editable template. The exported data is shown in the following table:</p></div>
+<div class="tableblock">
+<table rules="all"
+width="100%"
+frame="border"
+cellspacing="0" cellpadding="4">
+<col width="50%" />
+<col width="50%" />
+<tbody>
+<tr>
+<td align="left" valign="top"><p class="table"><strong>Name</strong></p></td>
+<td align="left" valign="top"><p class="table"><strong>Description</strong></p></td>
+</tr>
+<tr>
+<td align="left" valign="top"><p class="table">font</p></td>
+<td align="left" valign="top"><p class="table">(<strong>string</strong>) font family</p></td>
+</tr>
+<tr>
+<td align="left" valign="top"><p class="table">borderwidth</p></td>
+<td align="left" valign="top"><p class="table">(<strong>int</strong>) border-width value dynamically calculated as 0.1% of the page width with minimum value of 1px</p></td>
+</tr>
+<tr>
+<td align="left" valign="top"><p class="table">font_size</p></td>
+<td align="left" valign="top"><p class="table">(<strong>double</strong>) size of fonts in vw, ranges between 1.0 and 2.0</p></td>
+</tr>
+<tr>
+<td align="left" valign="top"><p class="table">line_spacing</p></td>
+<td align="left" valign="top"><p class="table">(<strong>double</strong>) distance between text lines, ranges between 1.0 and 3.0</p></td>
+</tr>
+<tr>
+<td align="left" valign="top"><p class="table">color1</p></td>
+<td align="left" valign="top"><p class="table">(<strong>string</strong>) background color</p></td>
+</tr>
+<tr>
+<td align="left" valign="top"><p class="table">color2</p></td>
+<td align="left" valign="top"><p class="table">(<strong>string</strong>) primary table cell color</p></td>
+</tr>
+<tr>
+<td align="left" valign="top"><p class="table">color3</p></td>
+<td align="left" valign="top"><p class="table">(<strong>string</strong>) secondary table cell color</p></td>
+</tr>
+<tr>
+<td align="left" valign="top"><p class="table">color4</p></td>
+<td align="left" valign="top"><p class="table">(<strong>string</strong>) primary text color</p></td>
+</tr>
+<tr>
+<td align="left" valign="top"><p class="table">color5</p></td>
+<td align="left" valign="top"><p class="table">(<strong>string</strong>) secondary text color</p></td>
+</tr>
+<tr>
+<td align="left" valign="top"><p class="table">color6</p></td>
+<td align="left" valign="top"><p class="table">(<strong>string</strong>) border colors</p></td>
+</tr>
+</tbody>
+</table>
+</div>
+<div class="literalblock">
+<div class="title">template.html</div>
+<div class="content">
+<pre><code>        border-width: {{ template_options.borderwidth }}px;</code></pre>
+</div></div>
+<div class="literalblock">
+<div class="title">output.html</div>
+<div class="content">
+<pre><code>        border-width: 3px;</code></pre>
+</div></div>
+<div class="paragraph"><p>Another variable that <em>Subsurface</em> exports is <strong>print_options</strong>. This variable contains a single member:</p></div>
+<div class="tableblock">
+<table rules="all"
+width="100%"
+frame="border"
+cellspacing="0" cellpadding="4">
+<col width="50%" />
+<col width="50%" />
+<tbody>
+<tr>
+<td align="left" valign="top"><p class="table"><strong>Name</strong></p></td>
+<td align="left" valign="top"><p class="table"><strong>Description</strong></p></td>
+</tr>
+<tr>
+<td align="left" valign="top"><p class="table">grayscale</p></td>
+<td align="left" valign="top"><p class="table">Use <em>CSS</em> filters to convert the page into grayscale (should be added to body style to enable printing grayscale prints)</p></td>
+</tr>
+</tbody>
+</table>
+</div>
+<div class="literalblock">
+<div class="title">template.html</div>
+<div class="content">
+<pre><code>        body {
+                {{ print_options.grayscale }};
+        }</code></pre>
+</div></div>
+<div class="literalblock">
+<div class="title">output.html</div>
+<div class="content">
+<pre><code>        body {
+                -webkit-filter: grayscale(100%);
+        }</code></pre>
+</div></div>
+</div>
+<div class="sect2">
+<h3 id="_defined_css_selectors">19.3. Defined CSS selectors</h3>
+<div class="paragraph"><p>As the dive profile is placed after rendering, <em>Subsurface</em> uses a special <em>CSS</em> selectors to do some searches
+in the HTML output. The <em>CSS</em> selectors in the following table should be added.</p></div>
+<div class="tableblock">
+<table rules="all"
+width="100%"
+frame="border"
+cellspacing="0" cellpadding="4">
+<col width="33%" />
+<col width="33%" />
+<col width="33%" />
+<tbody>
+<tr>
+<td align="left" valign="top"><p class="table"><strong>Selector</strong></p></td>
+<td align="left" valign="top"><p class="table"><strong>Type</strong></p></td>
+<td align="left" valign="top"><p class="table"><strong>Description</strong></p></td>
+</tr>
+<tr>
+<td align="left" valign="top"><p class="table">dive_{{ dive.id }}</p></td>
+<td align="left" valign="top"><p class="table">id</p></td>
+<td align="left" valign="top"><p class="table">is used to fetch the relevant dive profile</p></td>
+</tr>
+<tr>
+<td align="left" valign="top"><p class="table">diveProfile</p></td>
+<td align="left" valign="top"><p class="table">class</p></td>
+<td align="left" valign="top"><p class="table">each div that will contain a dive profile should have this class selector in addition to the dive_{{ dive.id }} id selector</p></td>
+</tr>
+<tr>
+<td align="left" valign="top"><p class="table">dontbreak</p></td>
+<td align="left" valign="top"><p class="table">class</p></td>
+<td align="left" valign="top"><p class="table">prevents the div with this class to be divided into two pages, this can be used
+in flow layout templates only (when data-numberofdives = 0)</p></td>
+</tr>
+</tbody>
+</table>
+</div>
+<div class="admonitionblock">
+<table><tr>
+<td class="icon">
+<img src="./images/icons/important.png" alt="Important" />
+</td>
+<td class="content">Rendering dive profiles is not supported for flow layout templates (when data-numberofdives = 0).</td>
+</tr></table>
+</div>
+</div>
+<div class="sect2">
+<h3 id="_special_attributes">19.4. Special attributes</h3>
+<div class="paragraph"><p>There are two ways of rendering- either rendering a specific number of dives in each page or make <em>Subsurface</em> try to
+fit as much dives as possible into one page (<em>flow</em> rendering).</p></div>
+<div class="paragraph"><p>The <strong>data-numberofdives</strong> data attribute is added to the body tag to set the rendering mode</p></div>
+<div class="ulist"><ul>
+<li>
+<p>
+render 6 dives per page:
+</p>
+</li>
+</ul></div>
+<div class="literalblock">
+<div class="content">
+<pre><code>        &lt;body data-numberofdives = 6&gt;</code></pre>
+</div></div>
+<div class="ulist"><ul>
+<li>
+<p>
+render as much dives as possible:
+</p>
+</li>
+</ul></div>
+<div class="literalblock">
+<div class="content">
+<pre><code>        &lt;body data-numberofdives = 0&gt;</code></pre>
+</div></div>
+<div class="admonitionblock">
+<table><tr>
+<td class="icon">
+<img src="./images/icons/important.png" alt="Important" />
+</td>
+<td class="content">All CSS units should be in relative lengths only, to support printing on any page size.</td>
+</tr></table>
+</div>
+</div>
+</div>
+</div>
+<div class="sect1">
+<h2 id="_appendix_f_faqs">20. APPENDIX F: FAQs.</h2>
 <div class="sectionbody">
 <div class="sect2">
-<h3 id="_subsurface_appears_to_miscalculate_gas_consumption_and_sac">19.1. Subsurface appears to miscalculate gas consumption and SAC</h3>
+<h3 id="S_APPENDIX_F">20.1. Subsurface appears to miscalculate gas consumption and SAC</h3>
 <div class="paragraph" id="SAC_CALCULATION"><p><em>Question</em>: I dived with a 12.2 l tank, starting with 220 bar and ending with 100 bar, and I calculate a different SAC compared what <em>Subsurface</em> calculates. Is <em>Subsurface</em>
 miscalculating?</p></div>
 <div class="paragraph"><p><em>Answer</em>: Not really. What happens is that <em>Subsurface</em> actually calculates gas
@@ -5565,7 +6547,7 @@ starts becoming much more noticeable at high pressure. A 400 bar really does not
 contain twice as much air as a 200 bar one. At lower pressures, air acts pretty much like an ideal gas.</p></div>
 </div>
 <div class="sect2">
-<h3 id="_some_dive_profiles_have_time_discrepancies_with_the_recorded_samples_from_my_dive_computer_8230">19.2. Some dive profiles have time discrepancies with the recorded samples from my dive computer&#8230;</h3>
+<h3 id="_some_dive_profiles_have_time_discrepancies_with_the_recorded_samples_from_my_dive_computer_8230">20.2. Some dive profiles have time discrepancies with the recorded samples from my dive computer&#8230;</h3>
 <div class="paragraph"><p><em>Subsurface</em> ends up ignoring surface time for many things (average depth, divetime, SAC, etc).
 <em>Question</em>:  Why do dive durations in my dive computer differ from that given by <em>Subsurface</em>?</p></div>
 <div class="paragraph"><p><em>Answer</em>: For example, if you end up doing a weight check (deep enough to trigger the "dive started")
@@ -5576,13 +6558,31 @@ It&#8217;s even more noticeable if you do things like divemastering the initial
 you may stay in the water for a long time, but spend most of it at the surface. And then
 you don&#8217;t want that to count as some kind of long dive”.</p></div>
 </div>
+<div class="sect2">
+<h3 id="_some_dive_profiles_are_missing_from_the_download">20.3. Some dive profiles are missing from the download</h3>
+<div class="paragraph" id="DC_HISTORY"><p><em>Question</em>: I cannot download all my dives, only the most recent ones
+even though my dive computer&#8217;s manual states that it records history of
+e.g. 999 dives.</p></div>
+<div class="paragraph"><p><em>Answer</em>: Dive history is different than the dive profiles on the log.
+The history only keeps track of the total number of dives and total
+amount of time spent below surface. The logs, on the other hand, store
+the dive profile, but they have limited amount of memory to do so. The
+exact amount of dive profiles that can be stored on the device depend on
+sample interval and duration of the dives. Once the memory is full the
+oldest dives get overwritten with new dives. Thus we are only able to
+download the last 13, 30 or 199 dives.</p></div>
+<div class="paragraph"><p>If you have downloaded your dives to different dive logging software
+before they were overwritten, there is a high chance that Subsurface can
+import these. However, if the logs are only on your dive computer, they
+cannot be salvaged after being over written by new dives.</p></div>
+</div>
 </div>
 </div>
 </div>
 <div id="footnotes"><hr /></div>
 <div id="footer">
 <div id="footer-text">
-Last updated 2015-02-17 08:49:01 PST
+Last updated 2015-10-13 08:46:54 PDT
 </div>
 </div>
 </body>
diff --git a/Documentation/user-manual_es.html.git b/Documentation/user-manual_es.html.git
index b654217ae..58bc110a1 100644
--- a/Documentation/user-manual_es.html.git
+++ b/Documentation/user-manual_es.html.git
@@ -3,7 +3,7 @@
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">
 <head>
 <meta http-equiv="Content-Type" content="application/xhtml+xml; charset=UTF-8" />
-<meta name="generator" content="AsciiDoc 8.6.8" />
+<meta name="generator" content="AsciiDoc 8.6.9" />
 <title></title>
 <style type="text/css">
 /*
@@ -411,7 +411,7 @@ asciidoc.install(3);
 <div class="paragraph"><p><strong>Autores</strong>: Willem Ferguson, Jacco van Koll, Dirk Hohndel, Reinout Hoornweg,
 Linus Torvalds, Miika Turkia, Amit Chaudhuri, Jan Schubert, Salvador Cuñat,
 Pedro Neves</p></div>
-<div class="paragraph"><p><span class="BLUE"><em>Versión 4.4, Febrero 2015</em></span></p></div>
+<div class="paragraph"><p><span class="BLUE"><em>Versión 4.5, Septiembre 2015</em></span></p></div>
 <div class="paragraph"><p>Bienvenido como usuario de <em>Subsurface</em>, un avanzado programa de registro de
 inmersiones con extensa infraestructura para describir, organizar e
 interpretarbuceos en apnea o con botella. <em>Subsurface</em> ofrece muchas ventajas
@@ -454,6 +454,12 @@ operativo.
 en cuenta las inmersiones ya guardadas y se integre con ellas?
 </p>
 </li>
+<li>
+<p>
+¿Necesitas una forma de guardar tus divelogs en internet, que te permita
+visualizarlo desde cualquier parte, simplemente usando un navegador web?
+</p>
+</li>
 </ul></div>
 <div class="paragraph"><p>Hay binarios disponibles para PCs con Windows (XP o posterior), Macs basados en
 Intel (OS/X) y muchas distribuciones de Linux. <em>Subsurface</em> puede compilarse
@@ -503,9 +509,9 @@ se puede hacer lanzando <em>Subsurface</em> desde la línea de comandos con la o
 <h2 id="S_StartUsing">3. Empezar a usar el programa</h2>
 <div class="sectionbody">
 <div class="paragraph"><p>La ventana <em>Subsurface</em> está, habitualmente, dividida en cuatro paneles con un
-<strong>Menú principal</strong> (Archivo Importar Registro Vista Filtros Ayuda) en la parte
-superior (en Windows y Linux) o en la parte superior de la pantalla (en Mac y
-Ubuntu Unity). Los cuatro paneles son:</p></div>
+<strong>Menú principal</strong> (Archivo Importar Registro Vista Ayuda) en la parte superior
+(en Windows y Linux) o en la parte superior de la pantalla (en Mac y Ubuntu
+Unity). Los cuatro paneles son:</p></div>
 <div class="olist arabic"><ol class="arabic">
 <li>
 <p>
@@ -526,7 +532,7 @@ la <strong>Lista de Inmersiones</strong>.
 </li>
 <li>
 <p>
-La <strong>Información de la inmersión</strong> arriba a la izquierda, presentando
+La <strong>Información</strong> arriba a la izquierda, presentando
 información más detallada de la inmersión seleccionada en la <strong>Lista de
 inmersiones</strong>, incluyendo algunas estadísticas de la inmersión seleccionada o de
 todas las inmersiones resaltadas.
@@ -543,17 +549,17 @@ del buceo seleccionado en la <strong>Lista de inmersiones</strong>.
 tamaño de cualquiera de ellos. <em>Subsurface</em> recuerda la posición de los
 divisores, así, la próxima vez que se inicie <em>Subsurface</em> utiliza las posiciones
 utilizadas la vez anterior.</p></div>
-<div class="paragraph"><p>Si se selecciona una inmersión en la <strong>Lista de inmersiones</strong>, se muestra su
+<div class="paragraph"><p>Si se selecciona una única inmersión en la <strong>Lista de inmersiones</strong>, se muestra su
 ubicación, información detallada y su perfil en sus paneles respectivos. Por
 otra parte, si uno selecciona más de un buceo, el último resaltado actuará como
 <em>inmersión seleccionada</em>, pero los datos resumidos de las <em>inmersiones
-resaltadas</em> se mostrarán en la pestaña <strong>Estadísticas</strong> del panel <strong>Información de
-la inmersión</strong> (máximas, mínimas y medias de profundidades, duraciones,
+resaltadas</em> se mostrarán en la pestaña <strong>Estadísticas</strong> del panel <strong>Información</strong>
+(máximas, mínimas y medias de profundidades, duraciones,
 temperaturas del agua, consumos de gases; el tiempo total y el número de
 inmersiones seleccionadas).</p></div>
 <div class="imageblock" id="S_ViewPanels" style="text-align:center;">
 <div class="content">
-<img src="images/main_window_f20.jpg" alt="La ventana principal" />
+<img src="images/main_window_f22.jpg" alt="La ventana principal" />
 </div>
 </div>
 <div class="paragraph"><p>El usuario puede elegir cual de los cuatro paneles se mostrará seleccionando la
@@ -637,227 +643,35 @@ buceo o el dive master o el guía, y algunas anotaciones acerca de la inmersión
 <em>Subsurface</em> puede conservar mucha más información por cada inmersión. Para
 añadir una inmersión a un registro de buceo, selecciona <em>Registro → Añadir
 Inmersión</em> en el menú principal. El programa muestra entonces tres paneles para
-introducir información: Dos pestañas en el panel <strong>Información de la Inmersión</strong>
-(<strong>Notas de la inmersión</strong> y <strong>Equipo</strong>), así como el panel perfil que muestra un
+introducir información: Dos pestañas en el panel <strong>Información</strong>
+(<strong>Notas</strong> y <strong>Equipo</strong>), así como el panel perfil que muestra un
 perfil gráfico de cada buceo. Estos paneles estan marcados respectivamente como
 <span class="red">A</span>, <span class="red">B</span> y <span class="red">C</span> en la figura de abajo. Ahora veremos cada una de
 las pestañas usadas para introducir la información.</p></div>
 <div class="imageblock" style="text-align:center;">
 <div class="content">
-<img src="images/AddDive1_f20.jpg" alt="FIGURA: Añadir inmersión" />
+<img src="images/AddDive1_f22.jpg" alt="FIGURA: Añadir inmersión" />
 </div>
 </div>
-<div class="paragraph"><p>Al editar un campo de los paneles <em>Notas de la Inmersión</em> o <em>Equipo</em>, <em>Subsurface</em>
+<div class="paragraph"><p>Al editar un campo de los paneles <em>Notas</em> o <em>Equipo</em>, <em>Subsurface</em>
 entra en el modo de edición. Esto se indica con el mensaje en un recuadro azul
-en la parte de arriba del panel <em>Notas de la Inmersión</em>. Este mensaje se
-muestra en todos los paneles dependientes de <em>Notas de la Inmersión</em> mientras
+en la parte de arriba del panel <strong>Notas</strong>. Este mensaje se
+muestra en todos los paneles dependientes de <em>Notas</em> mientras
 se esté en modo de edición.</p></div>
 <div class="imageblock" style="text-align:center;">
 <div class="content">
-<img src="images/BlueEditBar_f20.jpg" alt="Blue edit bar" />
+<img src="images/BlueEditBar_f22.jpg" alt="Blue edit bar" />
 </div>
 </div>
-<div class="paragraph"><p>El botón <em>Guardar</em> solo debería utilizarse cuando todas las partes de la
+<div class="paragraph"><p>El botón <em>Aplicar cambios</em> solo debería utilizarse cuando todas las partes de la
 inmersión hayan sido rellenadas. Cuando se introduzcan inmersiones a mano,
 deberían haberse completado las pestañas <em>Información</em>, <em>Equipo</em> y <em>Perfil</em>
-antes de guardar la información. Al seleccionar el botón <em>Guardar</em>, se guarda
+antes de guardar la información. Al seleccionar el botón <em>Aplicar cambios</em>, se guarda
 en memoria una copia local de la información. Al salir de <em>Subsurface</em>, el
 programa preguntará de nuevo, esta vez si se guarda el diario completo en el
 disco o no.</p></div>
 <div class="sect3">
-<h4 id="_notas_de_la_inmersion">5.1.1. Notas de la inmersión</h4>
-<div class="paragraph"><p>Este panel contiene la información de fecha, hora y lugar de un buceo concreto,
-condiciones ambientales, compañeros así como alguna información descriptiva. Si
-pulsas en la pestaña <strong>Notas de la inmersión</strong>, los siguientes campos aparecen
-visibles:</p></div>
-<div class="imageblock" style="text-align:center;">
-<div class="content">
-<img src="images/AddDive2_f20.jpg" alt="FIGURA: La pestaña Notas de la inmersión" />
-</div>
-</div>
-<div class="paragraph"><p>El campo <strong>Hora</strong> refleja la fecha y la hora de la inmersión. Clicando la fecha se
-muestra un calendario desde el que seleccionar la fecha correcta. Pulsa ESC para
-salir del calendario. La hora y los minutos también pueden editarse clicando en
-cada uno de ellos y sobreescribiendo la información mostrada. La fecha por
-defecto es la de hoy y la hora, una hora más adelante.</p></div>
-<div class="paragraph"><p><strong>Temperaturas de aire y agua</strong>: Las temperaturas de aire y agua durante la
-inmersión pueden teclearse en estos campos situados a la derecha de la Hora de
-Inicio. No es necesario teclear las unidades de la temperatura, <em>Subsurface</em> los
-asigna automáticamente, solo necesitas teclear los números. (Las unidades
-seleccionadas en Preferencias determinarán si se muestran en sistema métrico o
-imperial).</p></div>
-<div class="paragraph"><p><strong>Ubicación</strong>: Aquí puede introducirse el nombre del punto de buceo, e.g. "Tihany,
-Lake Balaton, Hungary". El autocompletado de los nombres hará esto mucho más
-fácil si se bucea frecuentemente en los mismos sitios.</p></div>
-<div class="paragraph"><p><strong>Coordenadas</strong>: Las coordenadas geográficas del punto de inmersión. Pueden
-provenir de tres orígenes:</p></div>
-<div class="olist loweralpha"><ol class="loweralpha">
-<li>
-<p>
-Se pueden encontrar las coordenadas en el mapamundi situado abajo a la
-   derecha en la ventana de <em>Subsurface</em>. El mapa muestra una barra verde indicando
-   "Mueve el mapa y haz doble clic para fijar la posición del buceo". Al hacer
-   doble clic en el lugar apropiado, la barra verde desaparece y las coordenadas
-   quedan grabadas
-</p>
-</li>
-<li>
-<p>
-Las coordenadas pueden obtenerse desde la app <em>Subsurface Companion</em> si se
-   tiene de un dispositivo android o iPhone con GPS y se guardaron las coordenadas del
-   punto de buceo usando ese dispositivo. <a href="#S_Companion">Pulsa aquí para más información.</a>
-</p>
-</li>
-<li>
-<p>
-Si se conocen, las coordenadas pueden introducirse a mano usando uno de los
-   cuatro formatos siguientes, con la latitud seguida de la longitud:
-</p>
-<div class="literalblock">
-<div class="content">
-<pre><code>Formato ISO 6709 Annex D, p.e. 30°13'28.9"N 30°49'1.5"E
-Grados y minutos decimales, p.e. N30º 13.49760', E30º 49.30788'
-Grados minutos y segundos, p.e. N30° 13' 29.8" , E30° 49' 1.5"
-Grados decimales, p.e. 30.22496 , 30.821798</code></pre>
-</div></div>
-</li>
-</ol></div>
-<div class="paragraph"><p>Las latitudes del hemisferio sur se dan con una S, p.e. S30º o con un valor
-negativo, p.e. -30.22496. De igual manera, las longitudes del oeste se dan con
-una W, p.e. W07º, o con un valor negativo, p.e. -7.34323.</p></div>
-<div class="paragraph"><p>Algunos teclados no disponen del signo de grados (°). Puede remplazarse con una
-"d", así:  N30d W20d.</p></div>
-<div class="paragraph"><p>Las coordenadas GPS de un punto de buceo están unidas al nombre de dicho punto
-así, al añadir coordenadas a inmersiones en las que no se ha facilitado una
-descripción de la ubicación se producirá un comportamiento inesperado
-(<em>Subsurface</em> pensará que todas estas inmersiones tienen la misma localización e
-intentará conservar las mismas coordenadas para todas).</p></div>
-<div class="paragraph"><p><strong>Modo de buceo</strong>: Esta es una casilla desplegable que permite elegir el tipo de
-inmersión que se ha realizado. Las opciones son OC (circuito abierto, del
-inglés "open circuit", el ajuste por defecto, valido para la mayoría de buceos
-recreativos), Apnea, CCR (rebreather de circuito cerrado, del inglés "closed
-circuit rebreather") o pSCR (rebreather pasivo de circuito semi-cerrado).</p></div>
-<div class="paragraph"><p><strong>Divemaster</strong>: Aqui puede introducirse el nombre del divemaster o el del guía de
-inmersión. De nuevo, este campo ofrece autocompletado basándose en la lista de
-divemasters del diario actual.</p></div>
-<div class="paragraph"><p><strong>Compañero</strong>: En este campo puede introducirse el nombre(s) del compañero(s),
-separados por comas, que acompañaron al usuario en la inmersión. También se
-ofrece autocompletado basado en la lista de compañeros del diario.</p></div>
-<div class="paragraph"><p><strong>Traje</strong>: Aquí puede introducirse el tipo de traje de buceo que se utilizó para
-la inmersión. Como en los casos anteriores está disponible el autocompletado.
-Los usuarios de traje seco pueden, por ejemplo, guardar cualquier combinación
-de traje y protección térmica que hayan utilizado.</p></div>
-<div class="paragraph"><p><strong>Valoración</strong>: En este campo se puede proporcionar una calificación subjetiva de
-la inmersión en una escala de 5 puntos, clicando en la estrella correspondiente.</p></div>
-<div class="paragraph"><p><strong>Visibilidad</strong>: Como en el caso anterior, se puede proporcionar una calificación
-de la visibilidad que había durante la inmersión en una escala de 5 puntos,
-clicando la estrella adecuada.</p></div>
-<div class="paragraph"><p><strong>Etiquetas</strong>: Se pueden introducir etiquetas (separándolas con comas) que
-describan el tipo de inmersión que se hizo. Algunos ejemplos de etiquetas
-habituales son: barco, a la deriva, entrenamiento, cueva, etc. <em>Subsurface</em>
-tiene muchas etiquetas predefinidas. De nuevo se ofrece autocompletado, por
-ejemplo, si tecleas <code>p</code>, se muestran las etiquetas <strong>pecio</strong>, <strong>piscina</strong> y
-<strong>profunda</strong> para que elijas entre ellas.</p></div>
-<div class="paragraph"><p><strong>Notas</strong>: Cualquier información adicional que se desee conservar puede
-introducirse aquí.</p></div>
-<div class="paragraph"><p>Los botones <strong>Guardar</strong> y <strong>Cancelar</strong> se utilizan para guardar toda la información
-de los campos del panel de información y del panel de perfil, por lo que no hay
-necesidad de usarlos hasta que se ha añadido TODA la información. Aquí hay un
-ejemplo de panel de Notas de la Inmersión completo:</p></div>
-<div class="imageblock" style="text-align:center;">
-<div class="content">
-<img src="images/CompletedDiveInfo_f20.jpg" alt="FIGURA: Una pestaña de Notas de la Inmersión completada" />
-</div>
-</div>
-</div>
-<div class="sect3">
-<h4 id="_equipo">5.1.2. Equipo</h4>
-<div class="paragraph"><p>La pestaña Equipo permite al usuario introducir información acerca del tipo de
-botella y gas utilizado, así como el lastre utilizado en una inmersión. Esta
-parte de <em>Subsurface</em> es altamente interactiva y la información de botellas y
-gases que se introduzca determinará el comportamiento del perfil de la inmersión
-(panel de arriba a la derecha).</p></div>
-<div class="paragraph" id="S_CylinderData"><p><strong>Botellas</strong>: La información de las botellas se introduce con un dialogo como
-este:</p></div>
-<div class="imageblock" style="text-align:center;">
-<div class="content">
-<img src="images/Gas_dialogue1_f20.jpg" alt="FIGURA: Dialogo de botellas inicial" />
-</div>
-</div>
-<div class="paragraph"><p>El botón + arriba a la derecha permite al usuario añadir más botellas para esta
-inmersión. El icono oscuro de papelera de la izquierda permite borrar la
-información de una botella en concreto. Nótese que no es posible borrar una
-botella si se usa durante la inmersión. Implícitamente se utiliza una botella
-durante el buceo, incluso sin que haya un evento de cambio de gas, así que la
-primera botella no puede borrarse a menos que se cree otra antes.</p></div>
-<div class="paragraph"><p>Se empieza por seleccionar un tipo de botella en el lado izquierdo de la tabla.
-Para seleccionar una botella hay que hacer clic en la casilla Tipo. Esto
-mostrará un botón que puede usarse para desplegar una lista de botellas:</p></div>
-<div class="imageblock" style="text-align:center;">
-<div class="content">
-<img src="images/Gas_dialogue2_f20.jpg" alt="FIGURA: Botón del desplegable de la lista de botellas" />
-</div>
-</div>
-<div class="paragraph"><p>La lista desplegable puede utilizarse para seleccionar el tipo de botella que se
-usó en esta inmersión, o el usuario puede escribir en la casilla, con lo que se
-mostrarán las opciones disponibles para lo escrito. El <strong>Tamaño</strong> así como su
-<strong>Presión de trabajo</strong> se mostrarán automáticamente en el dialogo. Si la botella
-utilizada no coincide con ninguna de las disponibles, simplemente hay que
-escribir el nombre y una descripción de la botella en el campo <strong>Tipo</strong> y, si se
-desea, una <strong>Presión de trabajo</strong>. La botella introducida quedará guardada para
-futuras ocasiones.</p></div>
-<div class="paragraph"><p>Lo siguiente es indicar las presiones inicial y final del gas usado durante el
-buceo. Las unidades de presión (métrico/imperial) corresponden a las fijadas en
-<em>Preferencias</em>.</p></div>
-<div class="paragraph"><p>Finalmente, hay que introducir la mezcla de gas que se usó. Si se utilizó aire,
-puedes poner 21% o dejarlo en blanco. Si se usó nitrox o trimix, hay que
-especificar los porcentajes de oxigeno y helio, dejando en blanco el campo que
-no corresponda utilizar.
-Trás teclear la información para la botella, hay que pulsar <em>ENTER</em> en el
-teclado o hacer clic fuera de la casilla que contiene el cursor. Puede añadirse
-información para cualquier botella adicional usando el botón + de arriba a la
-derecha. Aquí hay un ejemplo de descripción completa para una inmersión en la
-que se han utilizado dos botellas (aire y EAN50):</p></div>
-<div class="imageblock" style="text-align:center;">
-<div class="content">
-<img src="images/CylinderDataEntry3_f20.jpg" alt="FIGURA: Tabla con la información de botellas completada" />
-</div>
-</div>
-<div class="paragraph"><p><strong>Lastre</strong>: Se puede introducir información sobre el sistema de lastre utilizado
-en una inmersión, usando un dialogo muy similar al de la información de las
-botellas. Si el usuario pulsa el botón + de arriba a la derecha en el dialogo de
-lastre, la tabla aparecerá como sigue</p></div>
-<div class="imageblock" style="text-align:center;">
-<div class="content">
-<img src="images/WeightsDataEntry1_f20.jpg" alt="FIGURA: El diálogo lastre" />
-</div>
-</div>
-<div class="paragraph"><p>Si se hace clic en el campo <strong>Tipo</strong>, se accede a una lista desplegable con la
-flecha:</p></div>
-<div class="imageblock" style="text-align:center;">
-<div class="content">
-<img src="images/WeightsDataEntry2_f20.jpg" alt="FIGURE: Desplegable con la lista de tipos de lastre" />
-</div>
-</div>
-<div class="paragraph"><p>La lista desplegable puede utilizarse para seleccionar el tipo de sistema de
-lastre utilizado o el usuario puede empezar a teclear en la casilla, con lo que
-se le mostrarán las opciones disponibles. En el campo <strong>Peso</strong> se introduce el
-peso usado durante el buceo. Trás teclear la información se pulsa <em>ENTER</em> en el
-teclado o se hace clic fuera de la casilla que contiene el cursor. Se puede
-poner información para más de un sistema de lastre añadiendo otro con el botón<br />
-de arriba a la derecha. Se pueden borrar lastres usando el icono de papelera de
-la izquierda. A continuación, un ejemplo de información para una inmersión con
-dos tipos de lastre: integrado y cinturón:</p></div>
-<div class="imageblock" style="text-align:center;">
-<div class="content">
-<img src="images/WeightsDataEntry3_f20.jpg" alt="FIGURA: Tabla con la información de lastre completada" />
-</div>
-</div>
-<div class="paragraph"><p>No es necesario pulsar el botón Guardar antes de que se haya terminado el perfil
-de la inmersión.</p></div>
-</div>
-<div class="sect3">
-<h4 id="S_CreateProfile">5.1.3. Crear un perfil de inmersión</h4>
+<h4 id="S_CreateProfile">5.1.1. Crear un perfil de inmersión</h4>
 <div class="paragraph"><p>EL <strong>Perfil de la Inmersión</strong> (una representación gráfica de la profundidad de
 buceo en función del tiempo) se muestra en el panel de arriba a la derecha de la
 ventana de <em>Subsurface</em> . Cuando se añade manualmente una inmersión a un diario,
@@ -870,8 +684,8 @@ representar mejor el buceo que se está describiendo.</p></div>
 </div>
 <div class="paragraph"><p><em>Modificar el perfil de la inmersión</em>: Cuando se mueve el cursor por el perfil,
 su posición se indica por dos líneas de colores (roja y verde), como se muestra
-a continuación. La profundidad y el tiempo se indican, respectivamente, en los
-ejes lateral izquierdo e inferior, y en el cajetín negro de información. Las
+a continuación. La profundidad y el tiempo se indican en el cajetín negro de
+información. Las
 unidades (métricas/imperiales) de los ejes vienen determinadas por los ajustes
 de las Preferencias. El perfil de la inmersión comprende varios segmentos
 definidos por puntos de referencia (puntos en blanco en el perfil, como los que
@@ -897,31 +711,17 @@ perfil pueden editarse, Esto se hace clicando en la descripción del gas para un
 punto de referencia concreto y eligiendo la mezcla apropiada del menú
 contextual. Cambiar el gas de un punto de referencia afecta al gas mostrado a la
 izquierda <em>a la izquierda</em> del punto. Nótese que únicamente los gases definidos
-en la pestaña <strong>Equipo</strong> aparecen en el menú contextual:</p></div>
+en la pestaña <strong>Equipo</strong> aparecen en el menú contextual (ver imagen a continuación).</p></div>
 <div class="imageblock" style="text-align:center;">
 <div class="content">
 <img src="images/DiveProfile3_f20.jpg" alt="FIGURA: Menú contextual de la composición del gas" />
 </div>
 </div>
-<div class="paragraph"><p>Abajo está el perfil de una inmersión a 25m durante 30 minutos, a la que se ha
-añadido un cambio de aire a EAN50 a 20 m tras los 30 minutos. En este caso, la
-primera botella en la pestaña <strong>Equipo</strong> contenía aire y la segunda contenía
-EAN50.</p></div>
-<div class="imageblock" style="text-align:center;">
-<div class="content">
-<img src="images/DiveProfile4_f20.jpg" alt="FIGURE: Perfil de inmersión completado" />
-</div>
-</div>
-</div>
-<div class="sect3">
-<h4 id="_guardar_la_informacion_introducida_a_mano">5.1.4. Guardar la información introducida a mano</h4>
-<div class="paragraph"><p>La información introducida en las pestañas <strong>Notas de la inmersión</strong>, Equipo y
-<strong>Perfil de la inmersión</strong> puede guardarse en el registro de inmersiones del
-usuario utilizando los dos botones arriba a la derecha de la pestaña "Notas de
-la Inmersión". Si se pulsa <em>Guardar</em>, los datos del buceo se guardan en el
-registro actual. Si se pulsa <em>Cancelar</em> los datos recién introducidos serán
-descartados. Al salir de <em>Subsurface</em> al usuario se le pedirá que guarde el
-registro con la nueva(s) inmersión(es).</p></div>
+<div class="paragraph"><p>Habiendo sido definido el perfil, se deben añadir más detalles para tener un
+registro más completo del buceo. Para hacer esto, deberían utilizarse las
+pestañas <strong>Notas</strong> y <strong>Equipo</strong> arrriba a la izquierda en la ventana de <em>Subsurface</em>.
+Haz clic en <a href="#S_Notes_dc"><strong>este enlace</strong></a> para ver instrucciones acerca del
+uso de estas pestañas.</p></div>
 </div>
 </div>
 <div class="sect2">
@@ -972,8 +772,8 @@ Conectar el cable de conexión a un puerto USB libre (o activar la conexión
 </li>
 <li>
 <p>
-Poner el ordenador de buceo en modo de comunicación con PC. El usuario debe
-   consultar el manual de su ordenador de buceo en concreto.
+Poner el ordenador de buceo en modo de comunicación con PC. Consulta el
+   manual de tu ordenador de buceo en concreto.
 </p>
 </li>
 <li>
@@ -994,10 +794,7 @@ su memoria, incluso cuando estas inmersiones ya han sido importadas a
 descargados previamente, si el ordenador de buceo lo permite. Esto hace que el
 proceso de descarga sea más rápido en la mayoría de ordenadores de buceo y
 ahorra batería en el ordenador (por lo menos en aquellos que no cargan mientras
-están conectados vía USB). Si , por algún motivo, el usuario quisiera importar
-todas las inmersiones del ordenador de buceo aunque algunas puede que ya estén
-en el registro, se puede marcar la casilla llamada Forzar descarga de todas las
-inmersiones.</p></div>
+están conectados vía USB).</p></div>
 <div class="ulist"><ul>
 <li>
 <p>
@@ -1053,35 +850,24 @@ Si se ha seleccionado la casilla <em>Preferir siempre inmersiones descargadas</e
 </li>
 <li>
 <p>
-Pulsar el botón <em>Aceptar</em> y aparecerá el diálogo <strong>B</strong> de la figura anterior.
-</p>
-</li>
-<li>
-<p>
-Con la comunicación establecida puede verse como se transfiere la información
+Ahora pulsar el botón <em>Descargar</em>.
+   Con la comunicación establecida puede verse como se transfiere la información
    del ordenador de buceo. Dependiendo del ordenador de buceo y/o el número de
    inmersiones guardadas, esto podría llevar algún tiempo. El usuario debe ser
    paciente. El diálogo <em>Descarga</em> muestra una barra de progreso en la parte
    inferior de la ventana (en algunos ordenadores de buceo la información del
    progreso puede ser imprecisa al no poder determinarse cuantos datos había hasta
-   haberse descargado). Cuando se ha completado la descarga de la información de
-   buceo, todas las inmersiones importadas aparecen en la <strong>Lista de inmersiones</strong>
+   haberse descargado). Tras una descarga correcta, aparecerá el diálogo <strong>B</strong> de
+   la imagen anterior. Las inmersiones descargadas aparecen en una tabla en el
+   lado derecho del diálogo. Cada inmersión se sitúa en una fila en la que se
+   muestra la fecha, la duración y la profundidad. Junto a cada buceo hay una
+   casilla seleccionable. Marca todas las inmersiones que deban trasladarse a la
+   <em>Lista de Inmersiones</em>. Luego pulsa el botón <em>Aceptar</em> en la parte de abajo
+   del diálogo. En el caso de la imagen anterior, las últimas seis inmersiones
+   han sido seleccionadas y se transferirán a la lista. Todas las inmersiones
+   importadas aparecen en la <strong>Lista de inmersiones</strong>
    ordenadas por fecha y hora. Es el momento de desconectar y apagar el ordenador
-   de buceo para ahorrar batería. Si se selecciona un buceo, el panel <strong>Perfil</strong>
-   muestra un gráfico informativo de profundidad/tiempo para esa inmersión
-   concreta.
-</p>
-</li>
-<li>
-<p>
-Tras haber sido descargadas, las inmersiones aparecen en forma de tabla a la
-   derecha del diálogo (ver imagen <strong>B</strong> anterior). Cada buceo ocupa una línea de
-   la tabla, mostrando la fecha, la duración y la profundidad. Junto a cada
-   línea hay una casilla seleccionable; selecciona todas las inmersiones que se
-   necesite transferir a la <strong>Lista de inmersiones</strong>. En el caso de la figura
-   anterior, se han seleccionado los últimos seis buceos y se transferirán a la
-   <strong>Lista de inmersiones</strong>.
-   Pulsar el botón <em>OK</em> y los buceos seleccionados serán transferidos.
+   de buceo para ahorrar batería.
 </p>
 </li>
 <li>
@@ -1169,7 +955,158 @@ información sobre las inmersiones grabadas en el ordenador de buceo.</p></div>
 </div></div>
 </div>
 <div class="sect3">
-<h4 id="S_DeviceNames">5.2.2. Cambiar el nombre de un ordenador de buceo</h4>
+<h4 id="S_Bluetooth">5.2.2. Conectar <em>Subsurface</em> con ordenadores de buceo con Bluetooth</h4>
+<div class="paragraph"><p>Bluetooth se está convirtiendo en una forma cada vez más común de comunicación
+entre los ordenadores de buceo y <em>Subsurface</em>. Por ejemplo, este mecanismo se
+usa en el Shearwater Petrel Mk2 o el OSTC3. <em>Subsurface</em> proporciona un
+interfaz Bluetooth muy independiente del sistema operativo utilizado. Ajustar
+<em>Susburface</em> para comunicación con Bluetooth requiere cuatro pasos:</p></div>
+<div class="ulist"><ul>
+<li>
+<p>
+Asegurarse de que Bluetooth está activado en el ordenador que ejecuta
+  <em>Subsurface</em>.
+</p>
+</li>
+<li>
+<p>
+Asegurarse de que <em>Subsurface</em> localiza el adaptador Bluetooth del
+  ordenador.
+</p>
+</li>
+<li>
+<p>
+Asegurarse de que el Bluetooth del ordenador de buceo está está en modo
+  descarga y es visible.
+</p>
+</li>
+<li>
+<p>
+Asegurarse de que <em>Subsurface</em> está emparejado con el ordenador de buceo.
+</p>
+</li>
+</ul></div>
+<div class="paragraph"><p>Abre el diálogo de descarga seleccionando <em>Import &#8594; Importar del ordenador
+de buceo</em> desde el <strong>Menú Principal</strong>. Si se selecciona la casilla etiquetada
+<em>"Elegir modo de descarga Bluetooth"</em> , aparecerá el diálogo que se muestra
+a continuación.</p></div>
+</div>
+<div class="sect3">
+<h4 id="_en_linux_o_macos">5.2.3. En Linux o MacOS</h4>
+<div class="imageblock" style="text-align:center;">
+<div class="content">
+<img src="images/DC_import_Bluetooth.jpg" alt="FIGURA: Descarga Bluetooth" />
+</div>
+</div>
+<div class="paragraph"><p>En plataformas <em>Linux</em> o <em>MacOS</em> el nombre del ordenador con <em>Subsurface</em>
+se muestran en el lado derecho. En el lado izquierdo, si el ordenador tiene
+conectado más de un dispositivo  Bluetooth, se puede seleccionar cual se desea
+conectar a <em>Subsurface</em>.
+Bajo la dirección se muestra el estado del adaptador (activado/desactivado) y
+puede cambiarse pulsando el botón <em>Activar/desactivar</em>.</p></div>
+<div class="paragraph"><p>Si no se muestra la dirección Bluetooth, es que <em>Subsurface</em> no localiza el
+dispositivo Bluetooth del ordenador en que se ejecuta. Asegúrate de que el
+driver Bluetooth está instalado correctamente y comprueba que se puede usar
+con otras utilidades Bluetooth como <em>bluetoothctl</em>, bluemoon u otras. Con esto
+se completaría los primeros dos pasos indicados anteriormente.</p></div>
+<div class="paragraph"><p>Asegúrate de que el ordenador de buceo es visible y se encuentra en modo
+descarga (Nota del traductor: es posible que este modo aparezca en inglés como
+"Upload" o su traducción literal "Subida"). Consulta el manual del ordenador
+de buceo para completar este paso, que sería el tercero de la lista anterior.</p></div>
+<div class="paragraph"><p>Selecciona el botón <em>Buscar</em> en la parte de abajo a la izquierda del diálogo
+anterior, Tras buscar unos momentos, el ordenador de buceo debería aparecer en
+la relación (tal vez entre otros dispositivos Bluetooth) de la lista de la
+izquierda del diálogo (ver imagen anterior). Si no es así, pulsa el botón,
+<em>Limpiar</em> y efectúa una nueva búsqueda utilizando el botón <em>Buscar</em>. Si
+<em>Subsurface</em> "ve" el ordenador de buceo, la línea de la lista contendrá el
+nombre del dispositivo, su dirección y su estado de emparejamiento. Si el
+dispositivo no está emparejado y tiene un fondo rojo, se puede abrir un menú
+contextual seleccionando su línea y pulsando clic-derecho. Pulsa el
+botón <em>Emparejar</em> y espera a que se complete la tarea.</p></div>
+<div class="sidebarblock">
+<div class="content">
+<div class="admonitionblock">
+<table><tr>
+<td class="icon">
+<img src="images/icons/important.png" alt="Important" />
+</td>
+<td class="content">Actualmente <em>Subsurface</em> no soporta emparejamiento con ordenadores de buceo que
+requieran un PIN definido. Para poder emparejar los dispositivos en este caso,
+habría que utiliza alguna otra utilidad del SO.</td>
+</tr></table>
+</div>
+<div class="paragraph"><p>Una forma de hacerlo es usar <code>bluetoothctl</code>:</p></div>
+<div class="literalblock">
+<div class="content">
+<pre><code>$ bluetoothctl
+[bluetooth]# agent KeyboardOnly
+Agent registered
+[bluetooth]# default-agent
+Default agent request successful
+[bluetooth]# pair 00:80:25:49:6C:E3
+Attempting to pair with 00:80:25:49:6C:E3
+[CHG] Device 00:80:25:49:6C:E3 Connected: yes
+Request PIN code
+[agent] Enter PIN code: 0000</code></pre>
+</div></div>
+</div></div>
+<div class="paragraph"><p>Después de que los dispositivos se hayan emparejado, se puede pulsar el botón
+<em>Guardar</em>.  Esto cerrará el diálogo. Ahora pulsa <em>Descargar</em> en el diálogo
+<em>Descargar del ordenador de buceo</em> que debería permanecer abierto. Los buceos
+descargado se mostrarán en el lado derecho de la ventana de descarga.</p></div>
+</div>
+<div class="sect3">
+<h4 id="_en_windows">5.2.4. En Windows</h4>
+<div class="imageblock" style="text-align:center;">
+<div class="content">
+<img src="images/DC_import_Bluetooth_Windows.png" alt="FIGURE: Descarga Bluetooth en Windows" />
+</div>
+</div>
+<div class="paragraph"><p>En plataformas Windows no está disponible la <em>sección de detalles de los
+dispositivos Bluetooth</em>. Para iniciar correctamente un escaneo pulsando el
+botón <em>Buscar</em> , comprueba que el dispositivo <em>Bluetooth</em> del ordenador con
+<em>Subsurface</em> está activado.</p></div>
+<div class="paragraph"><p>El paso del emparejado se efectúa de forma
+automática durante el proceso de descarga. Si los dispositivos no se han
+emparejado nunca, el sistema te pedirá permiso y mostrará un mensaje en el
+lado derecho de la pantalla: <em>Añadir un dispositivo. Pulsa para configurar tu
+dispositivo DC</em>. Siempre debes autorizar el emparejado. Tras haber seleccionado
+uno de los dispositivos encontrados, pulsa <em>Guardar</em>. Finalmente, selecciona
+el botón <em>Descargar</em> del diálogo de descargas y espera a que se complete el
+proceso.</p></div>
+<div class="admonitionblock">
+<table><tr>
+<td class="icon">
+<img src="images/icons/important.png" alt="Important" />
+</td>
+<td class="content">Hay que tener en cuenta que, actualmente, <em>Subsurface</em> solo funciona con
+adaptadores Bluetooth locales que usen Microsoft Bluetooth Stack. Si el
+dispositivo local usa drivers <em>Widcomm</em>, <em>Stonestreet One Bluetopia Bluetooth</em> o
+<em>BlueSolei</em> no funcionará.</td>
+</tr></table>
+</div>
+<div class="paragraph"><p>Un mensaje de aviso en la parte inferior izquierda de la <em>Selección de
+dispositivos Bluetooth remotos</em> muestra detalles del estado actual del agente
+Bluetooth.
+Si se desea seleccionar otro ordenador de buceo utilizando la <em>Selección de
+dispositivo Bluetooth remoto</em> pulsa el botón con tres puntos de <em>Elegir modo
+de descarga _Bluetooth</em>.</p></div>
+<div class="admonitionblock">
+<table><tr>
+<td class="icon">
+<img src="images/icons/important.png" alt="Important" />
+</td>
+<td class="content"><strong>EN CASO DE PROBLEMAS</strong>: Si el adaptador Bluetooth del ordenador con <em>Subsurface</em>
+se cuelga y el proceso de descarga falla repetidamente, <em>desempareja</em> los
+dispositivos y repite los pasos indicados anteriormente. Si a pesar de ello
+se sigue sin tener éxito, el <a href="#S_HowFindBluetoothDeviceName"><em>Apéndice A</em></a>
+contiene información para ajustar manualmente e inspeccionar la conexión
+Bluetooth con <em>Subsurface</em>.</td>
+</tr></table>
+</div>
+</div>
+<div class="sect3">
+<h4 id="S_DeviceNames">5.2.5. Cambiar el nombre de un ordenador de buceo</h4>
 <div class="paragraph"><p>Es posible que sea necesario distinguir entre diferentes ordenadores de buceo
 usados para cargar inmersiones en <em>Subsurface</em>. Por ejemplo, si el ordenador del
 compañero es de la misma marca y modelo que el del usuario y los diarios de
@@ -1187,29 +1124,32 @@ aparecerá el nombre que se haya asignado a ese dispositivo en particular en
 lugar del modelo, permitiendo una identificación de dispositivos más fácil.</p></div>
 </div>
 <div class="sect3">
-<h4 id="S_EditDiveInfo">5.2.3. Actualizar la información de buceo importada del ordenador.</h4>
+<h4 id="S_EditDiveInfo">5.2.6. Actualizar la información de buceo importada del ordenador.</h4>
 <div class="paragraph"><p>Con los buceos descargados en la <strong>Lista de inmersiones</strong>, la información del
 ordenador no está completa y es necesario añadir más detalles para tener un
 registro más detallado de las inmersiones. Para ello se usan las pestañas
-<strong>Notas de la Inmersión</strong> y <strong>Equipo</strong> arriba a la izquierda de la ventana de
+<strong>Notas</strong> y <strong>Equipo</strong> arriba a la izquierda de la ventana de
 <em>Subsurface</em>.</p></div>
-</div>
-<div class="sect3">
-<h4 id="_notas_de_la_inmersion_2">5.2.4. Notas de la inmersión</h4>
-<div class="paragraph"><p>La fecha y hora del buceo, la mezcla de gases y, a menudo, la temperatura del
-agua se muestran al haberse obtenido del ordenador de buceo, pero el usuario
-necesita añadir a mano alguna información para tener un registro más completo de
-la inmersión. En algunos casos (p.e. rebreathers APD) también se ha de facilitar
-la fecha y la hora. Si se cambia o edita de alguna manera el contenido de esta
+<div class="sect4">
+<h5 id="S_Notes_dc">Notas</h5>
+<div class="paragraph"><p>El usuario debe añadir información a mano para poder tener un registro más
+completo. La información a continuación es casi idéntica para inmersiones
+creadas manualmente y para inmersiones descargadas del ordenador.</p></div>
+<div class="paragraph"><p>En algunos casos, se debe proporcionar la fecha y la hora de la inmersión, por
+ejemplo al crear un buceo a mano o cuando un ordenador no facilita la fecha y
+la hora de la inmersión (habitualmente la fecha y hora del buceo, la mezcla de gases
+y, la temperatura del agua se obtienen del ordenador de buceo). Si se cambia o
+edita de alguna manera el contenido de esta
 pestaña, el mensaje de la barra azul arriba del panel indicará que se está
-editando el buceo. Si se pulsa en la pestaña <strong>Notas de la inmersión</strong>, se
-visualizan los siguientes campos:</p></div>
+editando el buceo. Si se pulsa en la pestaña <strong>Notas</strong>, se
+visualizan los siguientes campos (imagen a la izquierda, a continuación:</p></div>
 <div class="imageblock" style="text-align:center;">
 <div class="content">
-<img src="images/AddDive3_f20.jpg" alt="FIGURA: La pestaña Notas de la inmersión" />
+<img src="images/AddDive3_f22.jpg" alt="FIGURA: La pestaña Notas" />
 </div>
 </div>
-<div class="paragraph"><p>El campo <strong>Hora</strong> refleja la fecha y la hora de la inmersión. Clicando la fecha se
+<div class="paragraph"><p>La imagen derecha anterior muestra una pestaña <strong>Notas</strong> llena de información.
+El campo <strong>Hora</strong> refleja la fecha y la hora de la inmersión. Clicando la fecha se
 muestra un calendario desde el que seleccionar la fecha correcta. Pulsa ESC para
 salir del calendario. La hora y los minutos también pueden editarse clicando en
 cada uno de ellos y sobreescribiendo la información mostrada.</p></div>
@@ -1223,20 +1163,39 @@ aire ya que el cambio en la lectura del sensor de temperatura es bastante lento
 para seguir los cambios en el entorno. Si fuera necesario, no hay que teclear
 las unidades de temperatura: <em>Subsurface</em> las suministra automáticamente de
 acuerdo con las <em>Preferencias</em> (métricas o imperiales).</p></div>
-<div class="paragraph"><p><strong>Ubicación</strong>: Se teclea aquí el texto que describa el lugar donde se hizo la
-inmersión, p.e. "Tihany, Lake Balaton, Hungary". El autocompletado de los
-nombres hará este paso más simple cuando el usuario bucee frecuentemente en los
-mismos sitios.</p></div>
-<div class="paragraph"><p><strong>Coordenadas</strong>: Las coordenadas geográficas del punto de inmersión. Pueden
-provenir de tres orígenes:</p></div>
+<div class="paragraph"><p><strong>Ubicación</strong>: Aquí se puede introducir el nombre del punto de buceo, p.e.
+"Tihany, Lake Balaton, Hungary" Los puntos de buceo se gestionan como una
+parte separada del registro. Tras introducir la información para un punto de
+buceo en concreto, si se efectúan varios buceos en el mismo lugar, la
+información se reutiliza sin necesitar toda la información de nuevo. La
+información existente puede editarse en cualquier momento seleccionando
+(en el panel <strong>Lista de Inmersiones</strong>) un buceo efectuado en el lugar deseado y
+abriendo la información de la ubicación haciendo clic en el botón con el globo
+a la derecha del nombre del lugar (ver la imagen de arriba a la derecha).
+Cuando se introduce el nombre de una ubicación, el auto completado de nombres
+hace que sea fácil seleccionar un punto de buceo que ya exista en el divelog
+(p.e. al teclear el nombre de un punto de buceo, aparece una lista desplegable
+ mostrando todos los lugares con nombres similares). Si el lugar se ha utilizado
+antes, pulsa en el nombre preexistente.</p></div>
+<div class="paragraph"><p>Si este punto de buceo no ha sido usado con anterioridad, aparece un mensaje
+como el siguiente (imagen <strong>A</strong> a continuación):</p></div>
+<div class="imageblock" style="text-align:center;">
+<div class="content">
+<img src="images/Locations1_f22.jpg" alt="FIGURA: Panel de descripción de ubicación" />
+</div>
+</div>
+<div class="paragraph"><p>Clica el icono + en el lado derecho. Aparecerá un panel para introducir las
+coordenadas y otra información sobre el lugar que pueda ser importante (imagen
+<strong>B</strong>, anterior). Lo más importante son las coordenadas del punto. Hay tres formas
+de especificarlas:</p></div>
 <div class="olist loweralpha"><ol class="loweralpha">
 <li>
 <p>
 El usuario puede encontrar las coordenadas en el mapamundi situado abajo a la
-   derecha en la ventana de <em>Subsurface</em>. El mapa muestra una barra verde indicando
-   "Mueve el mapa y haz doble clic para fijar la posición del buceo". Al hacer
-   doble clic en el lugar apropiado, la barra verde desaparece y las coordenadas
-   quedan grabadas
+   derecha en la ventana de <em>Subsurface</em>. El mapa muestra una barra marrón indicando
+   "Sin datos de ubicación - Mueve el mapa y haz doble clic para fijar la posición
+   del buceo". Al hacer doble clic en el lugar apropiado, la barra marrón desaparece
+   y las coordenadas quedan grabadas
 </p>
 </li>
 <li>
@@ -1263,7 +1222,17 @@ Grados decimales, p.e. 30.22496 , 30.821798</code></pre>
 </ol></div>
 <div class="paragraph"><p>Las latitudes del hemisferio sur se dan con una <strong>S</strong>, p.e. S30º o con un valor
 negativo, p.e. -30.22496. De igual forma, las longitudes al oeste se facilita
-con una <strong>W</strong>, p.e. W07°, o con un valor negativo, p.e. -7.34323.</p></div>
+con una <strong>W</strong>, p.e. W07°, o con un valor negativo, p.e. -7.34323. Algunos teclados
+no tienen el símbolo °. Puede reemplazarse con una <strong>d</strong> como en N30d W20d.</p></div>
+<div class="paragraph"><p><strong>Importante</strong>: Las coordenadas GPS de un punto están unidas a un nombre, por
+tanto, añadir coordenadas a inmersiones que no tengan una descripción del lugar
+causará comportamientos inesperados (<em>Subsurface</em> creerá que todos estos puntos
+son el mismo e intentará hacer que toas las coordenadas sean iguales).</p></div>
+<div class="paragraph"><p>Introduce cualquier otra información textual sobre el punto de buceo
+(Descripción y Notas), entonces selecciona <em>Aplicar cambios</em> para guardar la
+información de este punto de buceo. En una etapa posterior esta información
+puede editarse pulsando el icono del globo a la derecha del nombre del punto en
+la pestaña <strong>Notas</strong>.</p></div>
 <div class="paragraph"><p><strong>Modo de buceo</strong>: Esta es una casilla desplegable que permite elegir el tipo de
 inmersión que se ha realizado. Las opciones son OC (circuito abierto, del
 inglés "open circuit", el ajuste por defecto, valido para la mayoría de buceos
@@ -1291,24 +1260,21 @@ tiene muchas etiquetas predefinidas. De nuevo se ofrece autocompletado, por
 ejemplo, si el usuario teclea <code>p</code>, se muestran las etiquetas <strong>pecio</strong>, <strong>piscina</strong>
 y <strong>profunda</strong> para que elija entre ellas.</p></div>
 <div class="paragraph"><p><strong>Notas</strong>: Teclea aquí cualquier información adicional que desees conservar.</p></div>
-<div class="paragraph"><p>Los botones <strong>Guardar</strong> y <strong>Cancelar</strong> se utilizan para guardar toda la información
-de los campos del panel de información y del panel de perfil, por lo que no hay
-necesidad de usarlos hasta que se ha añadido TODA la información. Aquí hay un
-ejemplo de panel de Notas de la Inmersión completo:</p></div>
-<div class="imageblock" style="text-align:center;">
-<div class="content">
-<img src="images/CompletedDiveInfo_f20.jpg" alt="FIGURA:Una pestaña completa de Notas de la Inmersión" />
-</div>
+<div class="paragraph"><p>Los botones <em>Aplicar cambios</em> y <em>Descartar cambios</em> se utilizan para guardar
+toda la información de los campos del panel de <strong>Información</strong> y del panel de
+<strong>Perfil</strong>, por lo que no hay necesidad de usarlos hasta que se ha añadido
+<strong>TODA</strong> la información. La imagen <a href="#S_Notes_dc">al inicio de esta sección</a>
+muestra un ejemplo de la pestaña <strong>Notas</strong> rellenadas.</p></div>
 </div>
 </div>
 <div class="sect3">
-<h4 id="_equipo_2">5.2.5. Equipo</h4>
+<h4 id="_equipo">5.2.7. Equipo</h4>
 <div class="paragraph"><p>La pestaña Equipo permite al usuario introducir información acerca del tipo de
 botella y gas utilizado, así como el lastre utilizado en una inmersión. El
 mensaje en azul arriba del panel</p></div>
 <div class="imageblock" style="text-align:center;">
 <div class="content">
-<img src="images/BlueEditBar_f20.jpg" alt="FIGURA: Barra azul de edición" />
+<img src="images/BlueEditBar_f22.jpg" alt="FIGURA: Barra azul de edición" />
 </div>
 </div>
 <div class="paragraph"><p>indica que la inmersión se está editando. Esta parte de <em>Subsurface</em> es
@@ -1322,13 +1288,14 @@ este:</p></div>
 <img src="images/DC_gas-dialogue1_f20.jpg" alt="FIGURA: Diálogo de Botellas inicial" />
 </div>
 </div>
-<div class="paragraph"><p>En la mayoría de los casos <em>Subsurface</em> obtiene el gas usado del ordenador de
-buceo e inserta automáticamente la composición (% oxigeno) en la tabla. El botón
-+ arriba a la derecha permite al usuario añadir más botellas para esta
-inmersión. El icono oscuro de papelera le permitirá borrar la información de una
-botella. Nótese que no se puede borrar una botella si se usa durante el buceo.
-Una botella puede estar usándose implícitamente, incluso sin un evento de cambio
-de gas.</p></div>
+<div class="paragraph"><p>En las inmersiones manuales, esta información ha de ser introducida a mano. En
+el caso de los ordenadores, a menudo, <em>Subsurface</em> obtiene el gas usado del
+propio ordenador de buceo insertando automáticamente la composición (% oxigeno)
+en la tabla. El botón + arriba a la derecha permite al usuario añadir más
+botellas para esta inmersión. El icono oscuro de papelera le permitirá borrar
+la información de una botella. Nótese que no se puede borrar una botella si
+se usa durante el buceo. Una botella puede estar usándose implícitamente,
+incluso sin un evento de cambio de gas.</p></div>
 <div class="paragraph"><p>Se empieza por seleccionar un tipo de botella. Para ello hay que hacer clic en
 la casilla <strong>Tipo de botella</strong>. Esto hará aparecer un botón que puede usarse para
 mostrar una lista desplegable de botellas.</p></div>
@@ -1340,7 +1307,7 @@ mostrar una lista desplegable de botellas.</p></div>
 <div class="paragraph"><p>La lista desplegable puede usarse para seleccionar el tipo de botella que
 utilizó en esta inmersión, o el usuario puede empezar a teclear en la casilla,
 lo que mostrará las opciones disponibles para las letras introducidas. El
-<strong>Tamaño</strong> así como su <strong>Presión de trabajo</strong> se mostrarán automáticamente en el
+<strong>Tamaño</strong> así como su <em>Presión de trabajo</em> se mostrarán automáticamente en el
 dialogo.</p></div>
 <div class="paragraph"><p>A continuación es necesario indicar la presión inicial y final del gas usado
 durante el buceo. Las unidades de presión (métricas/imperiales) corresponden a
@@ -1367,7 +1334,7 @@ la tabla aparecerá como sigue</p></div>
 <img src="images/WeightsDataEntry1_f20.jpg" alt="FIGURA: El diálogo Lastre" />
 </div>
 </div>
-<div class="paragraph"><p>Si se hace clic en el campo Tipo, se accede a una lista desplegable con la
+<div class="paragraph"><p>Si se hace clic en el campo <em>Tipo</em>, se accede a una lista desplegable con la
 flecha:</p></div>
 <div class="imageblock" style="text-align:center;">
 <div class="content">
@@ -1391,10 +1358,10 @@ inmersión con dos tipos de lastre: integrado y cinturón:</p></div>
 </div>
 </div>
 <div class="sect3">
-<h4 id="_editar_simultaneamente_varias_inmersiones_seleccionadas">5.2.6. Editar simultáneamente varias inmersiones seleccionadas</h4>
+<h4 id="_editar_simultaneamente_varias_inmersiones_seleccionadas">5.2.8. Editar simultáneamente varias inmersiones seleccionadas</h4>
 <div class="paragraph"><p><em>METODO 1</em>: Tras descargar inmersiones de un ordenador de buceo, los perfiles
 de los buceos descargados se mostrarán en el panel "Perfil de la inmersión",
-así como algunas otras informaciones en las pestañas "Notas de la Inmersión" y
+así como algunas otras informaciones en las pestañas "Notas" y
 "Equipo". Sin embargo, otros campos permanecerán vacíos.</p></div>
 <div class="paragraph"><p>Puede resultar útil editar simultáneamente algunos de los campos de las "Notas
 de la Inmersión" o del "Equipo". Por ejemplo, es posible que un buceador
@@ -1402,7 +1369,7 @@ efectuara varias inmersiones en un solo día utilizando el mismo equipo, o en el
 mismo punto de buceo o con el mismo guía o compañero. En lugar de completar la
 información de las inmersiones una por una, se pueden seleccionar todos los
 buceos deseados en la "Lista de Inmersiones" e insertar la información común en
-las "Notas de Inmersión" y "Equipo".</p></div>
+las "Notas" y "Equipo".</p></div>
 <div class="paragraph"><p>La edición simultánea solo funciona con campos que no contienen aún ninguna
 información. Esto significa que si, para una inmersión en concreto, uno de los
 campos ya ha sido rellenado, no será modificado por la edición simultánea en
@@ -1415,10 +1382,10 @@ varias seleccionadas.</p></div>
 <div class="paragraph"><p>Esto acelera notablemente el rellenado del divelog después de haber efectuado
 varios buceos similares.</p></div>
 <div class="paragraph" id="S_CopyComponents"><p><em>METODO 2</em>: Hay una forma diferente de hacer lo mismo. Seleccionamos un buceo
-que contenga toda la información apropiada  en las pestañas <strong>Notas de la
-Inmersión</strong> y <strong>Equipo</strong>. Entonces, desde el menú principal, seleccionamos
+que contenga toda la información apropiada  en las pestañas <strong>Notas</strong> y <strong>Equipo</strong>.
+Entonces, desde el menú principal, seleccionamos
 <em>Registro &#8594; Copiar componentes</em>. Aparecerá una ventana con casillas
-seleccionables para la mayoría de campos de las pestañas <strong>Notas de la inmersión</strong>
+seleccionables para la mayoría de campos de las pestañas <strong>Notas</strong>
 y <strong>Equipo</strong>.  Selecciona los campos a copiar desde la inmersión seleccionada,
 luego pulsa <em>Aceptar</em>. Ahora selecciona en la <strong>Lista de Inmersiones</strong> los buceos
 a los que pegar esta información. Desde el menú principal, selecciona <em>Registro
@@ -1426,7 +1393,7 @@ a los que pegar esta información. Desde el menú principal, selecciona <em>Regi
  contendrán los datos seleccionados previamente de la anterior inmersión.</p></div>
 </div>
 <div class="sect3">
-<h4 id="_anadir_marcas_a_una_inmersion">5.2.7. Añadir Marcas a una inmersión</h4>
+<h4 id="_anadir_marcas_a_una_inmersion">5.2.9. Añadir Marcas a una inmersión</h4>
 <div class="paragraph"><p>Muchos buceadores desean anotar en sus inmersiones textos que indiquen sucesos
 concretos durante el buceo, p.e. "Avistamos delfines" o "Lanzada boya deco".
 Esto se hace fácilmente:</p></div>
@@ -1466,14 +1433,15 @@ Cuando el ratón pase sobre el marcador rojo, el texto guardado se mostrará en
 </div>
 </div>
 <div class="sect3">
-<h4 id="_guardar_la_informacion_de_buceo_actualizada">5.2.8. Guardar la información de buceo actualizada</h4>
-<div class="paragraph"><p>La información introducida en las pestañas Notas de la inmersión y Equipo puede
-guardarse utilizando los dos botones de arriba a la derecha de la pestaña <strong>Notas
-de la Inmersión</strong>. Si se pulsa <em>Guardar</em> los datos del buceo se guardan. Si se
-pulsa <em>Cancelar</em> los datos de buceo recién introducidos se borran, aunque el
-perfil y los datos descargados del ordenador quedarán retenidos. Cuando el
-usuario salga de <em>Subsurface</em> hay una pregunta final para confirmar si los
-nuevos datos se guardan.</p></div>
+<h4 id="_guardar_la_informacion_de_buceo_actualizada">5.2.10. Guardar la información de buceo actualizada</h4>
+<div class="paragraph"><p>La información introducida en las pestañas Notas y Equipo puede
+guardarse utilizando los dos botones de arriba a la derecha de la pestaña
+<strong>Notas</strong>. Si se pulsa <em>Aplicar cambios</em> los datos del buceo se guardan en la
+imagen en memoria de la inmersión. Si se pulsa <em>Descartar cambios</em> los datos
+de buceo recién introducidos se borran de la memoria, aunque el perfil y los
+datos descargados del ordenador quedarán retenidos. Cuando el usuario salga de
+<em>Subsurface</em> hay una pregunta final para confirmar si los nuevos datos de deben
+guardar en caso de no haberlo hecho antes.</p></div>
 </div>
 </div>
 <div class="sect2">
@@ -1505,7 +1473,8 @@ Shearwater.</p></div>
 mismo buceo y mezcla la información lo mejor que puede. Si no existen problemas
 con las zonas horarias (u otras razones que hagan que la hora de comienzo de las
 inmersiones sean significativamente diferentes) <em>Subsurface</em> no creará entradas
-duplicadas.</p></div>
+duplicadas. A continuación sigue más información relativa a importar datos a
+<em>Subsurface</em></p></div>
 <div class="sect3">
 <h4 id="Unified_import">5.3.1. Utilizar el diálogo de importación universal</h4>
 <div class="paragraph"><p>El importar buceos desde otros programas se hace a través de una interfaz
@@ -1528,6 +1497,11 @@ Diarios en formato XML (DivingLog 5.0, MacDive y varios otros)
 </li>
 <li>
 <p>
+Archivos de Cochran
+</p>
+</li>
+<li>
+<p>
 Diarios en formato UDDF (p.e. Kenozoooid)
 </p>
 </li>
@@ -1543,6 +1517,31 @@ Diarios de CCR Poseidon MKVI
 </li>
 <li>
 <p>
+Diarios de CCR APD Inspiration/Evolution
+</p>
+</li>
+<li>
+<p>
+Diarios de LiquidVision
+</p>
+</li>
+<li>
+<p>
+Diarios de divelogs.de
+</p>
+</li>
+<li>
+<p>
+Diarios de DataTrak
+</p>
+</li>
+<li>
+<p>
+Diarios de OSTCTools
+</p>
+</li>
+<li>
+<p>
 JDiveLog
 </p>
 </li>
@@ -1564,7 +1563,28 @@ están soportados algunos otros formatos, no accesibles desde el diálogo
 Importar, como se explica a continuación.</p></div>
 </div>
 <div class="sect3">
-<h4 id="_importar_desde_mares_dive_organiser_v2_1">5.3.2. Importar desde Mares Dive Organiser V2.1</h4>
+<h4 id="_importar_desde_ostctools">5.3.2. Importar desde OSTCTools</h4>
+<div class="paragraph"><p><em>OSTCTools</em> es un conjunto de herramientas basadas en Windows de descarga y
+gestión para la familia de ordenadores OSTC. <em>OSTCTools</em> puede descargar datos
+de las inmersiones y guardarlos en archivos binarios con extensión <em>.dive</em> .
+Subsurface puede importar directamente estos archivos utilizando el diálogo de
+importación universal. Desde la lista desplegable abajo a la derecha, se
+selecciona la opción correspondiente, lo cual hará visibles los diarios en la
+lista del panel. Se seleccionan una o varias inmersiones, y se hace click en el
+botón <em>Abrir</em>. Las inmersiones importadas desde OSTCTools se mostrarán en el
+panel <strong>Lista de inmersiones</strong>.</p></div>
+<div class="paragraph"><p>Actualmente, todos los ordenadores de H&amp;W que soporte OSTCTools pueden importarse
+a <em>Subsurface</em>, esto incluye OSTC, OSTC Mk2, OSTC 2N/2C, OSTC3, OSTC Sport, y,
+probablemente aunque sin probar, Frog, OSTC2 y OSTC CR.</p></div>
+<div class="paragraph"><p>Por favor, recuerda que OSTCTools <strong>no</strong> es un auténtico software de registro de
+diarios de buceo, sino un útil conjunto de herramientas de gestión y análisis
+para dispositivos OSTC.  Así pues, importar inmersiones a <em>Subsurface</em> sólo
+nos proporcionará datos relativos al ordenador de buceo; el usuario tendrá
+que completar manualmente el resto de datos que le puedan resultar importantes
+(compañeros, equipo, notas, etc).</p></div>
+</div>
+<div class="sect3">
+<h4 id="_importar_desde_mares_dive_organiser_v2_1">5.3.3. Importar desde Mares Dive Organiser V2.1</h4>
 <div class="paragraph"><p>Dado que Mares utiliza software propiedad de Microsoft no compatible con
 aplicaciones multiplataforma, estos diarios no pueden importarse directamente a
 <em>Subsurface</em>. Los diarios de Mares necesitan ser importados usando un proceso en
@@ -1596,15 +1616,15 @@ Finalmente importar las inmersiones desde <em>divelogs.de</em> a <em>Subsurface<
 </ol></div>
 </div>
 <div class="sect3">
-<h4 id="S_ImportingDivelogsDe">5.3.3. Importar inmersiones desde <strong>divelogs.de</strong></h4>
+<h4 id="S_ImportingDivelogsDe">5.3.4. Importar inmersiones desde <strong>divelogs.de</strong></h4>
 <div class="paragraph"><p>Importar información de inmersiones desde <em>divelogs.de</em> es simple, se usa un
 único diálogo. Se selecciona <em>Importar → Importar desde Divelogs.de</em> en el menú
-principal. Esto despliega un diálogo (ver figura [<strong>A</strong>] abajo a la izquierda). Es
+principal. Esto despliega un diálogo (ver figura <strong>A</strong> abajo a la izquierda). Es
 necesario introducir un usuario y password para <em>divelogs.de</em> en los campos que
 se indiquen y luego pulsar el botón <em>Descargar</em>. La descarga desde divelogs.de
 comienza inmediatamente y se refleja en una barra de progreso de la ventana del
 diálogo. Al finalizar la descarga se indica el estado de "exito" (ver figura
-[<strong>B</strong>] abajo a la derecha). Se selecciona el botón <em>Aplicar</em>, tras lo cual las
+<strong>B</strong> abajo a la derecha). Se selecciona el botón <em>Aplicar</em>, tras lo cual las
 inmersiones importadas aparecerán en el panel <strong>Lista de Inmersiones</strong>.</p></div>
 <div class="imageblock" style="text-align:center;">
 <div class="content">
@@ -1613,7 +1633,7 @@ inmersiones importadas aparecerán en el panel <strong>Lista de Inmersiones</str
 </div>
 </div>
 <div class="sect3">
-<h4 id="S_ImportingCSVData">5.3.4. Importar datos en formato CSV</h4>
+<h4 id="S_ImportingCSVData">5.3.5. Importar datos en formato CSV</h4>
 <div class="paragraph"><p>Se puede utilizar un archivo .csv (valores separados por comas) para importar
 información de buceo así como perfiles de inmersión (como en el caso de los
 CCRs APD Inspiration o el Evolution) o como metadatos de buceo (en caso de que
@@ -1627,7 +1647,7 @@ para información que puede resultar útil para importar datos basados en hojas
 de cálculo a <em>Subsurface</em>.</p></div>
 </div>
 <div class="sect3">
-<h4 id="S_ImportingCSVDives">5.3.5. Importar inmersiones en formato <em>CSV</em> desde ordenadores u otro software</h4>
+<h4 id="S_ImportingCSVDives">5.3.6. Importar inmersiones en formato <em>CSV</em> desde ordenadores u otro software</h4>
 <div class="paragraph"><p>Se puede visualizar un archivo <em>CSV</em> usando un editor de textos ordinario. Se
 organiza, normalmente, en una sola línea que proporciona las cabeceras (o
 <em>nombres de campo</em> o <em>encabezamientos</em>) de las columnas de datos, seguidos por
@@ -1664,10 +1684,10 @@ cosas sobre los mismos:</p></div>
 <li>
 <p>
 ¿ Que carácter separa las distintas columnas en una línea de datos ? Este
-   separador de campos debería ser una coma (,) o un tabulador. Puede averiguarse
-   abriendo el archivo con un editor de textos. Si se trata de una coma, el
-   carácter será claramente visible entre valores. Si no hay comas a la vista,
-   seguramente esté delimitado por tabuladores.
+   separador de campos debería ser una coma (,) un punto y coma (;) o un
+   tabulador. Puede averiguarse abriendo el archivo con un editor de textos.
+   Si se trata de una coma, el carácter será claramente visible entre valores.
+   Si no hay comas a la vista, seguramente esté delimitado por tabuladores.
 </p>
 </li>
 <li>
@@ -1813,8 +1833,8 @@ asegurarse de que el resto funciona.</p></div>
 </div>
 <div class="sect2">
 <h3 id="S_Companion">5.4. Importar coordenadas GPS con la app <em>Subsurface</em> Companion para teléfonos móviles</h3>
-<div class="paragraph"><p>Utilizando la app <em>Subsurface</em> Companion en un dispositivo Android con GPS o
-<a href="#S_iphone"><em>iPhone</em></a>, se pueden pasar automáticamente las coordenadas de los
+<div class="paragraph"><p>Utilizando la app <em>Subsurface</em> Companion en un dispositivo Android o <a href="#S_iphone"><em>iPhone</em></a>
+con GPS, se pueden pasar automáticamente las coordenadas de los
 puntos de buceo al registro de <em>Subsurface</em>. La app Companion guarda las
 ubicaciones de buceo en un servidor dedicado basado en internet. <em>Subsurface</em>
 puede recoger las coordenadas desde este servidor.</p></div>
@@ -2241,10 +2261,17 @@ problema crítico es que la sincronización horaria entre la cámara y el ordena
 de buceo no sea perfecta, en ocasiones difieren varios minutos. Si <em>Subsurface</em>
 puede sincronizarlos, entonces puede utilizar las horas de las fotografías para
 posicionarlas en el perfil de la inmersión.</p></div>
-<div class="paragraph"><p><em>Subsurface</em> puede conseguir esta sincronización de dos maneras:</p></div>
+<div class="paragraph"><p><em>Subsurface</em> puede conseguir esta sincronización de tres maneras:</p></div>
 <div class="ulist"><ul>
 <li>
 <p>
+<strong>Proactivamente</strong>: Antes de la inmersión, asegúrate de que los ajustes de la
+   cámara coinciden con los del ordenador de buceo, cambiándolo en uno de los
+   dispositivos o en ambos.
+</p>
+</li>
+<li>
+<p>
 <strong>Manualmente</strong>: Si el usuario anotó la hora exacta de la cámara al inicio de la
    inmersión, se puede obtener la diferencia de tiempo entre los dos dispositivos.
    En realidad, si no se han variado los ajustes horarios, se pueden conseguir tras
@@ -2294,16 +2321,23 @@ perfil de la inmersión. Si está en un rango de 30 minutos, sí se muestra.</p>
 <div class="ulist"><ul>
 <li>
 <p>
-La pestaña <em>Fotos</em> del panel <em>Notas de la inmersión</em>.
+La pestaña <em>Fotos</em> del panel <em>Notas</em>.
 </p>
 </li>
 <li>
 <p>
 Como pequeños iconos (chinchetas) sobre el perfil de inmersión, en posiciones
-   que relejan la hora en que se tomó cada fotografía. Ver a continuación:
+   que relejan la hora en que se tomó cada fotografía. Para ver las fotos sobre el
+   perfil, activa el botón <em>Mostrar fotos</em> a la izquierda del perfil:
 </p>
 </li>
 </ul></div>
+<div class="imageblock" style="text-align:left;">
+<div class="content">
+<img src="images/icons/ShowPhotos_f20.png" alt="FIGURE:Show photos toolbar button" />
+</div>
+</div>
+<div class="paragraph"><p>Esto producirá un perfil como el que se muestra a continuación</p></div>
 <div class="imageblock" style="text-align:center;">
 <div class="content">
 <img src="images/LoadImage4_f20.jpg" alt="FIGURA: Fotos sobre un perfil de inmersión" />
@@ -2360,6 +2394,74 @@ pestaña _Fotos</em> solo mostrará los nombres de los archivos de las imágenes
 es el funcionamiento normal. Si, posteriormente, el disco externo con las fotos
 se vuelve a conectar, las fotos se visualizarán normalmente.</p></div>
 </div>
+<div class="sect3">
+<h4 id="S_FindMovedImages">6.2.3. Mover fotografías entre directorios, discos duros u ordenadores</h4>
+<div class="paragraph"><p>Tras haber cargado una fotografía en <em>subsurface</em> y haberla asociado a un buceo
+determinado, se archiva el directorio donde la foto permanece guardada, para poder
+encontrarla cuando se vuelva a abrir la inmersión. Si la foto o la colección
+completa de fotos se trasladan a otro disco o a una máquina distinta, sería
+bastante raro que la estructura de directorios fuera idéntica a la de la fotografía
+cargada originalmente. Cuando esto sucede, <em>Subsurface</em> busca las fotos en el
+directorio original desde el que fueron cargadas, no las encuentra y, por tanto,
+no las puede mostrar. Ya que, después de mover fotos, un gran número puede
+necesitar borrarse y reimportarse desde la nueva localización, <em>Subsurface</em>
+tiene un mecanismo que facilita el proceso de actualizar la información del
+directorio para cada foto: actualizaciones automáticas utilizando huellas.</p></div>
+<div class="paragraph"><p>Cuando se carga una foto en <em>Subsurface</em>, se calcula una huella para la imagen
+y se guarda con la otra información de referencia para la foto. Tras mover una
+colección de fotos (que ya ha sido cargada en <em>Subsurface</em>) a un directorio,
+disco u ordenador diferente, <em>Subsurface</em> puede llevar a cabo los siguientes
+pasos:</p></div>
+<div class="ulist"><ul>
+<li>
+<p>
+Buscar en un directorio concreto (y todos sus subdireectorios recursivamente)
+al que se han llevado las fotos.
+</p>
+</li>
+<li>
+<p>
+Calcular huellas para todas las fotos de este directorio, y
+</p>
+</li>
+<li>
+<p>
+si hay coincidencia entre una de las huellas calculadas y la que se calculó
+al cargar la foto en <em>Subsurface</em> (incluso si el nombre del archivo hubiera
+cambiado), actualizar automáticamente la información de directorio, de foma que
+<em>Subsurface</em> pueda encontrar la foto en el nuevo directorio.
+</p>
+</li>
+</ul></div>
+<div class="paragraph"><p>Esto se consigue seleccionando desde el Menú Principal: <em>Archivo &#8594; Encontrar
+imágenes desplazadas</em>. Esto presenta una ventana en la cual es necesario
+especificar el NUEVO directorio de las fotos. Se selecciona el directorio
+apropiado y se clica el botón <em>Escanear</em> en la parte inferior derecha del
+panel. El proceso puede requerir varios minutos para completarse, tras lo
+cual <em>Subsurface</em> mostrará las fotos correctas cuando se abra un buceo.</p></div>
+<div class="sidebarblock" id="Image_fingerprint_upgrade">
+<div class="content">
+<div class="paragraph"><p><strong>Actualizar colecciones de fotos existentes sin huella</strong></p></div>
+<div class="admonitionblock">
+<table><tr>
+<td class="icon">
+<img src="images/icons/important.png" alt="Important" />
+</td>
+<td class="content">El software para la actualización automática de colecciones de fotos se halla
+en desarrollo activo. Actualmente las inmersiones deben actualizarse
+individualmente, una cada vez. Se selecciona el botón de la barra de
+herramientas del panel <strong>Perfil de Inmersión</strong> que activa la posibilidad de ver
+en pantalla las imágenes. Las miniaturas de las imágenes se mostrarán sobre
+el perfil de la inmersión. Modifica cualquier cosa en el panel <strong>Notas</strong> que
+fuerce la aparición de la barra azul de edición que permite salvar las
+modificaciones (por ejemplo añade y borra un espacio al final de las notas de
+la inmersión). Selecciona la opción <em>Aplicar cambios</em> para guardar la
+información de la inmersión y las huellas se calcularán al guardar mientras
+se guarda la inmersión.</td>
+</tr></table>
+</div>
+</div></div>
+</div>
 </div>
 <div class="sect2">
 <h3 id="_registrar_tipos_de_inmersion_especiales">6.3. Registrar tipos de inmersión especiales</h3>
@@ -2377,7 +2479,7 @@ dos clases de información que necesitan proporcionarse:</p></div>
 <li>
 <p>
 <strong>Describir las botellas usadas durante el buceo</strong>. Esto se hace en la pestaña
-  <strong>Equipo</strong> del panel <strong>Información de la inmersión</strong> tal como <a href="#cylinder_definitions">se describe anteriormente</a>.
+  <strong>Equipo</strong> del panel <strong>Información</strong> tal como <a href="#cylinder_definitions">se describe anteriormente</a>.
   se introducen las botellas una a una, especificando las características de la
   botella y la composición del gas de cada una de ellas.
 </p>
@@ -2496,7 +2598,7 @@ solo los pasos normales descritos con anterioridad:</p></div>
 <li>
 <p>
 Seleccionar el modo pSCR en el desplegable <em>Modo de inmersión</em> en el panel
-  <strong>Información de la inmersión</strong>.
+  <strong>Información</strong>.
 </p>
 </li>
 <li>
@@ -2531,14 +2633,14 @@ reciclar el gas que se ha respirado, mientras mantienen una concentración de
 oxígeno respirable llevando a cabo dos acciones:
 a) Eliminan dióxido de carbono del gas que se ha exhalado.
 b) Regulan la concentración de oxígeno para que permanezca en los límites.
-En la actualidad, en <em>Subsurface</em> el Poseidon MKVI Discovery es el ordenador
-de buceo CCR mejor soportado. El interfaz CCR de <em>Subsurface</em> es, ahora mismo,
-experimental y está bajo desarrollo activo.  En contraste con un ordenador
+La interfaz CCR de <em>Subsurface</em> es experimental actualmente y se halla bajo
+desarrollo activo. <em>Subsurface</em> soporta en estos momentos el Poseidon MKVI y
+los PD Discovery/Evolution  En contraste con un ordenador
 de buceo recreativo convencional, el ordenador de un sistema CCR no permite
 descargar un diario que contenga múltiples inmersiones. En su lugar, cada buceo
 se guarda independientemente. Esto significa que <em>SUbsurface</em> no puede descargar
 el diario directamente desde un CCR, sino que lo importa de la misma manera que
-se importan datos de otras fuentes digitales.</td>
+se importan datos de otras bases de datos digitales, una inmersión cada vez.</td>
 </tr></table>
 </div>
 </div>
@@ -2548,12 +2650,13 @@ se importan datos de otras fuentes digitales.</td>
 Desde el menú principal de <em>Subsurface</em>, seleccionar <em>Import &#8594; Importar archivos
 de registro</em> para desplegar el <a href="#Unified_import">Diálogo de importación universal</a>.
 Como se explicaba en esa sección, en la parte de abajo a la derecha hay una lista
-desplegable de dispositivos que incluye una opción para los archivos del
-(Poseidon) MKVI (la funcionalidad para otros dispositivos CCR está en desarrollo
+desplegable (etiquetada como <em>Filtro:</em>) de dispositivos que incluye los archivos del
+(Poseidon) MKVI o APD (la funcionalidad para otros dispositivos CCR está en desarrollo
 actualmente). Tras haber seleccionado el dispositivo y el directorio donde se
 hallan los archivos originales del ordenador CCR, se puede seleccionar un
 archivo concreto (en el caso del MKVI es un archivo con extensión .txt). Tras
-seleccionar el archivo, activar el botón <em>Abrir</em> de abajo a la derecha.</p></div>
+seleccionar el archivo, activar el botón <em>Abrir</em> de abajo a la derecha. Lee la
+sección a continuación para:</p></div>
 </div>
 <div class="sect3">
 <h4 id="_informacion_mostrada_para_un_buceo_con_ccr">6.3.6. Información mostrada para un buceo con CCR</h4>
@@ -2585,9 +2688,10 @@ Para sistemas de TRES sensores (p.e. APD), también se usa la media. Sin
 individuales puede mostrarse. La presentación en pantalla de información CCR
 adicional se activa seleccionando las opciones adecuadas en el panel <em>Preferencias</em>
 (accesible seleccionando <a href="#S_CCR_options"><em>Archivo &#8594;  Preferencias &#8594;  Gráfico</em></a>).
-Esta parte del panel <em>Preferencias</em> se presenta como dos casillas seleccionables
-que modifican la presentación de la pO<sub>2</sub> cuando se halla activada la opción
-correspondiente de la barra de herramientas del Perfil de Inmersión.</p></div>
+Esta parte del panel <em>Preferencias</em>, mostrada en la siguiente imagen,  se
+presenta como dos casillas seleccionables que modifican la presentación de la
+pO<sub>2</sub> cuando se halla activada la opción correspondiente de la barra de herramientas
+del Perfil de Inmersión.</p></div>
 <div class="imageblock" style="text-align:center;">
 <div class="content">
 <img src="images/CCR_preferences_f20.jpg" alt="FIGURA: Panel de preferencias de CCR" />
@@ -2599,7 +2703,7 @@ herramientas del panel <em>Perfil</em> esté activado.</p></div>
 <div class="paragraph"><p>La primera casilla permite mostrar información del setpoint. Esta es una línea
 roja superpuesta al gráfico verde de presión parcial de oxígeno y permite
 comparar la media de presiones parciales de oxígeno medidas, frente al valor
-del setpoint, como en la imagen a continuación.</p></div>
+del setpoint, como se muestra a continuación.</p></div>
 <div class="paragraph"><p>image::images/CCR_setpoint_f20.jpg"FIGURA: Gráfico de pO2 y setpoint del CCR",align="center"]</p></div>
 <div class="paragraph"><p>La segunda casilla permite mostrar datos de cada sensor de oxígeno individual
 del equipo CCR. Los datos de cada sensor se colorean de la siguiente forma:</p></div>
@@ -2645,12 +2749,33 @@ información de presión de las botellas. En este caso hay una buena coincidenci
 entre las lecturas de los dos sensores de oxígeno.</p></div>
 <div class="imageblock" style="text-align:center;">
 <div class="content">
-<img src="images/CCR_dive_profile_f20.jpg" alt="FIGURA: Perfil de inmersión con CCR" />
+<img src="images/CCR_dive_profile_f22.jpg" alt="FIGURA: Perfil de inmersión con CCR" />
 </div>
 </div>
 <div class="paragraph"><p><em>Información especifica del equipo</em>: <em>Subsurface</em> recoge información que puede
 ser especifica de un tipo de equipo concreto. Se muestra en la <a href="#S_ExtraDataTab">pestaña Otros Datos</a>.
 Puede incluir información de ajustes o metadatos sobre la inmersión.</p></div>
+<div class="paragraph"><p>El techo calculado por <em>Subsurface</em> no es muy preciso dado que no se puede
+determinar fiablemente la presión de nitrógeno en el circuito desde el divelog
+importado del equipo del CCR. Muchos ordenadores de buceo CCR, sin embargo,
+informan del techo calculado internamente por ellos mismos y este se mostrará
+en el perfil activando el botón correspondiente a la izquierda del perfil:</p></div>
+<div class="imageblock">
+<div class="content">
+<img src="images/icons/cceiling.jpg" alt="Icono de techo" />
+</div>
+</div>
+<div class="paragraph"><p>El color por defecto del techo de deco generado por el ordenador es blanco. Sin
+embargo, puede ajustarse a rojo seleccionando la correspondiente casilla en
+<em>Archivo &#8594; Preferencias &#8594; Gráfico</em>. A continuación se muestra un perfil
+mostrando el techo deco generado por el ordenador de buceo:</p></div>
+<div class="imageblock">
+<div class="content">
+<img src="images/CCR_dive_ceilingF22.jpg" alt="FIGURA: Perfil de inmersión con CCR" />
+</div>
+</div>
+<div class="paragraph"><p>Se puede encontrar más información, específica para cada ordenador, sobre
+como descargar divelogs de CCR en el <a href="#_appendix_b_dive_computer_specific_information_for_importing_dive_information">Apéndice B</a></p></div>
 </div>
 </div>
 </div>
@@ -2659,8 +2784,8 @@ Puede incluir información de ajustes o metadatos sobre la inmersión.</p></div>
 <h2 id="_obtener_mas_informacion_sobre_inmersiones_guardadas_en_el_diario">7. Obtener más información sobre inmersiones guardadas en el diario</h2>
 <div class="sectionbody">
 <div class="sect2">
-<h3 id="_la_pestana_informacion_de_la_inmersion_para_inmersiones_individuales">7.1. La pestaña Información de la inmersión (para inmersiones individuales)</h3>
-<div class="paragraph"><p>La pestaña Información de la inmersión proporciona alguna información resumida
+<h3 id="_la_pestana_informacion_para_inmersiones_individuales">7.1. La pestaña Información (para inmersiones individuales)</h3>
+<div class="paragraph"><p>La pestaña Información proporciona alguna información resumida
 sobre un buceo en particular que ha sido seleccionado en la <strong>Lista de
 inmersiones</strong>. La información útil incluye el intervalo en superficie antes de la
 inmersión, las profundidades máxima y media, el volumen de gas consumido, el
@@ -3069,7 +3194,8 @@ Son:</p></div>
 <td class="content">Activar este botón hace que el Recuadro de Información muestre la <strong>Profundidad
 máxima operativa (PMO)</strong> de la inmersión para la mezcla de gases utilizada. La
 PMO depende de la concentración de oxígeno en el gas respirado. Para el aire
-(21% de oxígeno) se sitúa alrededor de 57 m. Por debajo de la PMO existe un
+(21% de oxígeno) se sitúa alrededor de 57 m si se ha especificado una pO<sub>2</sub>
+máxima de 1.4 en la sección <strong>Preferencias</strong>. Por debajo de la PMO existe un
 riesgo muy elevado de exposición a los peligros asociados con la toxicidad del
 oxígeno.</td>
 </tr></table>
@@ -3223,10 +3349,9 @@ El gráfico <strong>E</strong> indica la situación después de permanecer a 4.5
 <div class="sectionbody">
 <div class="sect2">
 <h3 id="_el_menu_contextual_de_la_lista_de_inmersiones">8.1. El menú contextual de la Lista de Inmersiones</h3>
-<div class="paragraph"><p>Muchas acciones en <em>Subsurface</em> dependen de un menú contextual que se usa
-básicamente para manipular grupos de inmersiones. El menú contextual se
-encuentra seleccionando una inmersión o un grupo de ellas y haciendo
-clic-derecho.</p></div>
+<div class="paragraph"><p>Varias acciones sobre, bien una inmersión, bien un grupo de ellas, se pueden
+efectuar utilizando el Menú Contextual de la Lista de inmersiones, al que se
+accede seleccionando una inmersión o un grupo de ellas y haciendo clic-derecho.</p></div>
 <div class="imageblock" style="text-align:center;">
 <div class="content">
 <img src="images/ContextMenu.jpg" alt="Figura: Menú contextual" />
@@ -3235,7 +3360,7 @@ clic-derecho.</p></div>
 <div class="paragraph"><p>El menú contextual se usa en muchas de las acciones que se describen a
 continuación.</p></div>
 <div class="sect3">
-<h4 id="_personalizar_la_informacion_mostrada_en_el_panel_strong_lista_de_inmersiones_strong">8.1.1. Personalizar la información mostrada en el panel <strong>Lista de inmersiones</strong></h4>
+<h4 id="_personalizar_las_columnas_mostradas_en_el_panel_strong_lista_de_inmersiones_strong">8.1.1. Personalizar las columnas mostradas en el panel <strong>Lista de inmersiones</strong></h4>
 <div class="imageblock" style="text-align:center;">
 <div class="content">
 <img src="images/DiveListOptions.jpg" alt="Ejemplo: Opciones de la Lista de inmersiones" />
@@ -3272,6 +3397,11 @@ ocasiones, se puede necesitar renumerar los buceos. Esto se hace seleccionando
 secuencia inferior que se va a usar. Completar esta operación supone obtener
 nuevos números de secuencia (basados en fecha/hora) para los buceos del panel
 <strong>Lista de Inmersiones</strong>.</p></div>
+<div class="paragraph"><p>También se pueden renumerar algunas inmersiones seleccionadas de la lista. Se
+seleccionan las inmersiones que necesiten renumerarse. Se hace clic-derecho
+sobre la lista seleccionada y se utiliza la lista contextual para efectuar el
+renumerado. Aparecerá una ventana solicitando al usuario que especifique el
+número de inicio para el proceso de numeración.</p></div>
 </div>
 <div class="sect2">
 <h3 id="S_Group">8.3. Agrupar las inmersiones en viajes y manipularlos</h3>
@@ -3310,24 +3440,22 @@ se expande el viaje mostrando los buceos individuales efectuados.</p></div>
 </div>
 <div class="sect3">
 <h4 id="_colapsar_o_expandir_informacion_de_diferentes_viajes">8.3.3. Colapsar o expandir información de diferentes viajes</h4>
-<div class="paragraph"><p>Si se hace clic-derecho después de seleccionar un viaje concreto de la lista, el
-menú resultante te ofrece varias posibilidades de expandir o contraer buceos
-incluidos en viajes. Entre ellas expandir todos los viajes, contraer todos los
-viajes y contraer todos excepto el seleccionado.</p></div>
+<div class="paragraph"><p>Tras seleccionar un viaje concreto de la lista, el menú contextual resultante
+ofrece varias posibilidades de expandir o contraer buceos incluidos en viajes.
+Entre ellas expandir todos los viajes y contraer todos los viajes.</p></div>
 </div>
 <div class="sect3">
 <h4 id="_mezclar_inmersiones_de_mas_de_un_viaje_en_uno_solo">8.3.4. Mezclar inmersiones de más de un viaje en uno solo</h4>
-<div class="paragraph"><p>Al hacer clic-derecho en el título de un viaje seleccionado del panel <strong>Lista de
-Inmersiones</strong>, el menú permite mezclar viajes con el viaje de abajo o con el de
-arriba.</p></div>
+<div class="paragraph"><p>Tras seleccionar el título de un viaje del panel <strong>Lista de Inmersiones</strong>, el
+menú permite mezclar viajes con el viaje de abajo o con el de arriba.</p></div>
 </div>
 <div class="sect3">
 <h4 id="_separar_un_viaje_en_mas_de_uno">8.3.5. Separar un viaje en más de uno</h4>
-<div class="paragraph"><p>Si un viaje incluye cinco inmersiones, el usuario puede separar el viaje en dos
-(viaje 1: tres inmersiones de arriba; viaje 2: dos inmersiones de abajo)
-seleccionando y haciendo clic-derecho en las tres inmersiones de arriba. El menú
+<div class="paragraph"><p>Si un viaje incluye diez inmersiones, el usuario puede separar el viaje en dos
+(viaje 1: cuatro inmersiones de arriba; viaje 2: seis inmersiones de abajo)
+seleccionando y haciendo clic-derecho en las cuatro inmersiones de arriba. El menú
 que aparecerá te permite crear un nuevo viaje seleccionando la opción <strong>Crear
-nuevo viaje arriba</strong>. Las tres inmersiones superiores quedan entonces agrupadas
+nuevo viaje arriba</strong>. Las cuatro inmersiones superiores quedan entonces agrupadas
 en un viaje separado. La siguiente figura muestra la selección y el menú a la
 izquierda (A), la acción completada a la derecha (B):</p></div>
 <div class="imageblock" style="text-align:center;">
@@ -3351,7 +3479,8 @@ inmersiones de prueba o buceos de duración extremadamente corta.</p></div>
 <div class="paragraph"><p>Se pueden separar inmersiones del viaje al que pertenecen. Para ello se
 selecciona y hace clic-derecho en los buceos para mostrar el menú. Luego se
 selecciona <strong>Quitar inmersión(es) del viaje</strong>. Las inmersiones que han sido
-separadas aparecerán ahora encima del viaje al que pertenecieron.</p></div>
+separadas aparecerán ahora encima o debajo del viaje al que pertenecieron, en
+función de la fecha y la hora de la inmersión separada.</p></div>
 </div>
 <div class="sect3">
 <h4 id="_anadir_una_inmersion_al_viaje_de_arriba">8.4.3. Añadir una inmersión al viaje de arriba</h4>
@@ -3378,8 +3507,8 @@ grabadas por el ordenador y apareciendo como buceos distintos en el panel <stron
 de inmersiones</strong>. Se pueden unir estos buceos en uno solo seleccionando las
 correspondientes inmersiones y haciendo clic-derecho para mostrar el menú.
 Entonces se selecciona <strong>Mezclar inmersiones seleccionadas</strong>. Puede que sea
-necesario editar la información de la inmersión en el panel <strong>Notas de la
-inmersión</strong> para reflejar situaciones o condiciones que afecten al buceo
+necesario editar la información de la inmersión en el panel <strong>Notas</strong> para
+reflejar situaciones o condiciones que afecten al buceo
 resultante de la fusión. La figura a continuación muestra el perfil de dos
 inmersiones que fueron unidas:</p></div>
 <div class="imageblock" style="text-align:center;">
@@ -3388,6 +3517,15 @@ inmersiones que fueron unidas:</p></div>
 </div>
 </div>
 </div>
+<div class="sect3">
+<h4 id="_deshacer_manipulaciones_de_inmersiones">8.4.6. Deshacer manipulaciones de inmersiones</h4>
+<div class="paragraph"><p>Se pueden deshacer o rehacer acciones importantes, de las que se han comentado
+anteriormente, sobre inmersiones o viajes. Aquí se incluyen: <em>Borrar inmersión</em>,
+<em>Mezclar inmersiones</em>, <em>Renumerar inmersiones</em> y <em>Desplazar hora de buceo</em>.
+Para hacerlo, tras haber llevado a cabo cualquiera de estas acciones, se
+selecciona <em>Editar</em> desde el <strong>Menú Principal</strong>, lo que presentará un desplegable
+con las posibilidades <em>Deshacer</em> y <em>Rehacer</em>.</p></div>
+</div>
 </div>
 <div class="sect2">
 <h3 id="S_Filter">8.5. Filtrar la Lista de Inmersiones</h3>
@@ -3400,12 +3538,13 @@ compañero.</p></div>
 <div class="paragraph"><p>Para abrir el filtrado, seleccionar <em>Registro &#8594; Filtrar la lista de inmersiones</em>
 desde el menú principal. Esto abrirá el <em>Panel de filtrado</em> en la parte de arriba
 de la ventana de <em>Subsurface</em>. Arriba a la derecha del panel se ubican tres
-iconos. El <em>Panel de filtrado</em> puede reiniciarse (p.e. limpiar todos los filtros
-actuales) seleccionando el <strong>+</strong>. El <em>Panel de filtrado</em> también puede minimizarse
-seleccionando el icono central. Cuando está minimizado solo se muestran los tres
-iconos. El panel puede maximizarse clicando el icono que lo minimizó. El filtro
-se cierra y reinicia seleccionando el icono con la bandera.
-Un ejemplo del <em>Panel de filtrado</em> se muestra en la figura a continuación.</p></div>
+iconos (ver imagen a continuación).
+El <em>Panel de filtrado</em> puede reiniciarse (p.e. limpiar todos los filtros
+actuales) seleccionando la flecha amarilla. El <em>Panel de filtrado</em> también puede
+minimizarse seleccionando la <strong>flecha verde</strong>. Cuando está minimizado solo se
+muestran los tres iconos. El panel puede maximizarse clicando el icono que lo
+minimizó. El filtro se cierra y reinicia seleccionando el <strong>botón rojo</strong> con la
+cruz blanca.</p></div>
 <div class="imageblock" style="text-align:center;">
 <div class="content">
 <img src="images/Filterpanel.jpg" alt="Figura: Panel de filtrado" />
@@ -3449,26 +3588,26 @@ Exportar información de buceo a <em>Facebook</em>
 <div class="sect2">
 <h3 id="S_facebook">9.1. Exportar información de buceo a <em>Facebook</em></h3>
 <div class="paragraph"><p>La exportación de inmersiones a <em>Facebook</em> se maneja de forma diferente a otros
-tipos de exportación. Esto es debido a que exportar a <em>Facebook</em> requiere una
-conexión a esta red social y necesita un usuario de <em>Facebook</em> y su password.
+tipos de exportación porque se requiere una
+conexión a esta red social y se necesita un usuario de <em>Facebook</em> y su password.
 Si, desde el menú principal, seleccionamos <em>Archivo &#8594; Preferencias &#8594;
 Facebook</em>, se nos presentará una pantalla de acceso (ver imagen <strong>A</strong> de la
 izquierda a continuación). Introducimos nuestro usuario y password de
 <em>Facebook</em>. Una vez que nos hemos conectado a <em>Facebook</em>, se nos presenta el
-panel de la imagen <strong>B</strong> a continuación. Este panel tiene un botón que habrá que
-seleccionar para cerrar la conexión a <em>Facebook</em>.</p></div>
+panel de la imagen <strong>B</strong> a continuación, donde se incluye un botón <em>Desconectar</em>
+para cerrar la conexión a <em>Facebook</em>.</p></div>
 <div class="imageblock" style="text-align:center;">
 <div class="content">
 <img src="images/facebook1_f20.jpg" alt="Figure: Acceso a Facebook" />
 </div>
 </div>
 <div class="paragraph"><p>Tras haber establecido una conexión con <em>Facebook</em>, transferir un perfil de
-inmersión a nuestro perfil de <em>Facebook</em> es sencillo. Un icono de <em>Facebook</em>
-aparece en  el panel <strong>Notas de la inmersión</strong> de <em>Subsurface</em> (ver imagen <strong>A</strong> a
-continuación). Asegúrate de que la inmersión que quieres transferir al historial
-es la que se muestra en el panel <strong>Perfil de la inmersión</strong>. Selecciona el icono
-de <em>Facebook</em> y se mostrará un icono que determinará la cantidad de información
-transferida junto al perfil (ver imagen <strong>B</strong>, a continuación). Se necesita
+inmersión a nuestro perfil de <em>Facebook</em> es sencillo.
+Asegúrate de que la inmersión que quieres transferir al historial
+es la que se muestra en el panel <strong>Perfil de la inmersión</strong>. Si se pulsa
+<em>Compartir &#8594; Facebook</em> desde el <strong>Menú principal</strong> aparecerá un diálogo en el
+que se definirá la cantidad de información adicional que se desea transferir
+al historial junto con el perfil (ver imagen <strong>B</strong>, a continuación). Se necesita
 proporcionar el nombre de un álbum de <em>Facebook</em> para poder enviar el perfil de
 inmersión. Las casillas seleccionables de la izquierda nos permiten seleccionar
 la información que vamos a enviar. Esta información se muestra en la ventana de
@@ -3553,8 +3692,10 @@ Universal Dive Data format (UDDF). Ver <a href="http://uddf.org">http://uddf.org
 Formato <em>HTML</em>, en el cual los buceos se guardan en archivos HTML,
   visualizables con un navegador de internet.Se soportan la mayoría de navegadores
   modernos, pero debe estar activado Javascript. Este archivo <strong>NO</strong> es editable. El
-  registro de inmersiones en HTML contiene la mayor parte de la información y
-  dispone de una opción de búsqueda que permite rastrear el diario. La exportación
+  registro de inmersiones en HTML contiene la mayor parte de la información del
+  divelog. Sin embargo, no muestra los valores calculados del panel <strong>Perfil de
+  Inmersión</strong>, p.e. la presión calculada de la botella, presiones de los gases o
+  PMO. Dispone de una opción de búsqueda que permite rastrear el diario. La exportación
   a HTML se especifica en la segunda pestaña del diálogo de exportación (imagen
   <strong>B</strong> anterior). Un uso típico de esta opción es exportar todas nuestros buceos
   a un smartphone o tablet donde nos serviría de registro portátil, util para
@@ -3565,7 +3706,7 @@ Formato <em>HTML</em>, en el cual los buceos se guardan en archivos HTML,
 <p>
 Formato <em>mapamundi</em>, un archivo HTML con un mapa del mundo en el que quedará
   marcada cada inmersión y alguna información sobre ella. El mapa <strong>NO</strong> es
-  editable, sin embargo, si se selecciona cualquiera de los puntos de buceo
+  editable. Si se selecciona cualquiera de los puntos de buceo
   sobre el mapa, se muestra en texto un sumario de la inmersión, como se ve
   en la imagen a continuación.
 </p>
@@ -3635,9 +3776,106 @@ equipo, etc, la <em>nube</em> es una solución obvia. Esto, además, añade el b
 de que se puede acceder al diario, casi, desde cualquier parte del mundo sin
 tener que llevarlo encima. Por este motivo, facilidades como <em>divelogs.de</em> y
 <em>Diving Log</em> ofrecen la posibilidad de guardar dicha información en internet.</p></div>
-<div class="paragraph"><p>Aunque <em>Subsurface</em> no ofrece almacenamiento integrado de diarios en la nube, es
-facil de conseguir utilizando alguno de los varios servicios existentes en
-internet.</p></div>
+<div class="paragraph"><p><em>Subsurface</em> incluye acceso a almacenamiento en la nube integrado de forma
+transparente, disponible para todos los usuarios de Subsurface. Guardar y
+recuperar un divelog desde la nube no es más difícil que hacerlo desde un disco
+duro. El único requisito es que, previamente, nos hemos de registrar como
+usuarios. Para utilizar el <em>Almacenamiento en la nube de Subsurface</em> sigue estos
+pasos:</p></div>
+<div class="sect2">
+<h3 id="_crea_una_cuenta_en_el_almacenamiento_en_la_nube">10.1. Crea una cuenta en el almacenamiento en la nube:</h3>
+<div class="ulist"><ul>
+<li>
+<p>
+Abrir las <em>Preferencias de Red</em> seleccionando <em>Archivo</em> &#8594; <em>Preferencias</em> &#8594;
+   <em>Red</em>.
+</p>
+</li>
+<li>
+<p>
+En la sección llamada <em>Almacenamiento en la nube de Subsurface</em>, introduce un
+   correo electrónico que <em>Subsurface</em> pueda utilizar para registrarnos.
+</p>
+</li>
+<li>
+<p>
+Introduce una contraseña que <em>Subsurface</em> utilizará para guardar y recuperar
+   el divelog en la nube.
+</p>
+</li>
+<li>
+<p>
+Se clica en <em>Aplicar</em> o en <em>OK</em> para enviar el email y la password al
+   servidor en la nube. El servidor responderá con un correo a la dirección
+   facilitada que contendrá un PIN de verificación (está será la única ocasión
+   en que <em>Subsurface</em> usará la dirección de correo proporcionada). El diálogo
+   <em>Preferencias de Red</em> mostrará una nueva casilla de texto, que no se mostraba
+   antes, para el PIN.
+</p>
+</li>
+<li>
+<p>
+Se introduce el PIN en la casilla correspondiente del diálogo (Este campo solo
+   será visible mientras el servidor espera la confirmación de la dirección de
+   correo).
+</p>
+</li>
+<li>
+<p>
+Clica de nuevo en <em>Aplicar</em> o en <em>OK</em> y la cuenta del <em>Almacenamiento
+   de Subsurface en la nube</em> se marcará como verificada y se podrá utilizar el
+   servicio.
+</p>
+</li>
+</ul></div>
+</div>
+<div class="sect2">
+<h3 id="_usar_el_em_almacenamiento_de_subsurface_en_la_nube_em">10.2. Usar el <em>Almacenamiento de Subsurface en la nube</em></h3>
+<div class="ulist"><ul>
+<li>
+<p>
+Una vez que se ha inicializado el almacenamiento en la nube, aparecen dos
+   nuevas opciones en el desplegable <em>Archivo</em> del <em>Menú principal</em>: <em>Abrir
+   almacenamiento en la nube</em> y <em>Guardar en almacenamiento en la nube</em>. Estas
+   opciones permiten al usuario descargar y guardar los registros en el
+   servidor de <em>Subsurface</em> en la nube.
+</p>
+</li>
+<li>
+<p>
+En la pestaña de <em>Preferencias predeterminadas</em> se puede seleccionar usar el
+   almacenamiento en la nube como archivo por defecto seleccionando la casilla
+   marcada como <em>Archivo por defecto en la nube</em>.  Esto significa que los datos
+   del almacenamiento en la nube se cargarán al iniciar <em>Subsurface</em> y se
+   guardarán allí al salir del programa.
+</p>
+</li>
+<li>
+<p>
+<em>Subsurface</em> mantiene una copia local de los datos y sigue siendo completamente
+   funcional si se utiliza desconectado. Simplemente sincronizará los datos con el
+   servidor la próxima vez que se utilice el programa y exista conexión a internet.
+</p>
+</li>
+</ul></div>
+</div>
+<div class="sect2">
+<h3 id="S_Cloud_storage">10.3. Acceso web al <em>Almacenamiento de Subsurface en la nube</em></h3>
+<div class="paragraph"><p>Uno de los efectos interesantes de utilizar el <em>Almacenamiento de Subsurface
+en la nube</em> es que también se puede acceder a los datos con cualquier navegador.
+Simplemente se abre <a href="https://cloud.subsurface-divelog.org">https://cloud.subsurface-divelog.org</a>,
+se accede con los mismos e-mail y password, y se pueden visualizar los datos
+del registro hasta la última sincronización efectuada con el <em>Almacenamiento
+en la nube de Subsurface</em>. La información que se muestra son solo los contenidos
+de los registros, NO los valores calculados que aparecen en el panel <strong>Perfil</strong>,
+por ejemplo, presiones de botellas, techos deco o presiones parciales de
+O<sub>2</sub>/He/N<sub>2</sub>.</p></div>
+</div>
+<div class="sect2">
+<h3 id="_otros_servicios_en_la_nube">10.4. Otros servicios en la nube</h3>
+<div class="paragraph"><p>Si se prefiere no usar el almacenamiento en la nube integrado (y no se necesita
+tener acceso vía web a los datos), también resulta muy fácil guardar los
+divelogs en la nube usando uno de los servicios disponibles en internet.</p></div>
 <div class="paragraph"><p>Por ejemplo <a href="http://www.dropbox.com/"><em>Dropbox</em></a> ofrece una aplicación gratuita
 que permite que se vean como locales en nuestro ordenador los archivos guardados
 en sus servidores.</p></div>
@@ -3659,9 +3897,9 @@ se puede instalar accediendo a la <a href="http://www.dropbox.com/install"><em>p
 <em>de Dropbox</em>.</p></div>
 <div class="paragraph"><p>Como alternativa, se puede utilizar <em>Dropbox</em> como mecanismo para mantener una
 copia de seguridad del diario.</p></div>
-<div class="paragraph"><p>Para guardar un diario en la <em>nube</em>, selecciona <em>Archivo&#8594; Guardar como</em> desde
+<div class="paragraph"><p>Para guardar un diario en <em>Dropbox</em>, selecciona <em>Archivo&#8594; Guardar como</em> desde
 menú principal de <em>Subsurface</em>, navega a la carpeta Dropbox y selecciona el
-botón <em>Guardar</em>.  Para usar el diario en la nube, selecciona <em>Archivo&#8594;Abrir
+botón <em>Guardar</em>.  Para usar el diario en <em>Dropbox</em>, selecciona <em>Archivo&#8594;Abrir
 registro</em> desde el menú principal de <em>Subsurface</em>, navega al archivo en la
 carpeta Dropbox y selecciona el botón <em>Abrir</em>.</p></div>
 <div class="paragraph"><p>Existen varios servicios de pago en Internet (Google, Amazon &#8230;) con los que
@@ -3669,12 +3907,14 @@ se puede seguir el mismo proceso para tener los diarios de buceo almacenados en
 la nube.</p></div>
 </div>
 </div>
+</div>
 <div class="sect1">
 <h2 id="S_PrintDivelog">11. Imprimir un diario</h2>
 <div class="sectionbody">
-<div class="paragraph"><p><em>Subsurface</em> proporciona un interfaz simple para imprimir el diario completo o
-solo unas pocas inmersiones seleccionadas, incluyendo los perfiles de buceo y
-otra información.</p></div>
+<div class="paragraph"><p><em>Subsurface</em> proporciona un interfaz simple y flexible para imprimir el diario
+completo o solo unas pocas inmersiones seleccionadas. Se pueden utilizar
+plantillas pre instaladas o escritas a medida para seleccionar donde situar
+los datos en la página.</p></div>
 <div class="paragraph"><p>Antes de imprimir, se deben tomar dos decisiones:</p></div>
 <div class="ulist"><ul>
 <li>
@@ -3688,81 +3928,142 @@ otra información.</p></div>
 <p>
 ¿ Que información sobre presiones parciales de los gases se desea tener en el
   perfil ? El usuario activaría los botones apropiados de la barra de la izquierda
-  del perfil.
+  del panel <strong>Perfil de Inmersión</strong>.
 </p>
 </li>
 </ul></div>
-<div class="paragraph"><p>Ahora habra que seleccionar las opciones de impresión. Para ello se selecciona
-<em>Archivo → Imprimir</em> desde el menú principal. Aparecerá el siguiente diálogo
-(ver la imagen [A] abajo):</p></div>
+<div class="paragraph"><p>Si se ha seleccionado_Archivo &#8594; Imprimir_ desde el menú principal, aparecerá
+el diálogo siguiente (imagen *A). Se necesita especificar tres cosas para
+conseguir el diseño de información deseado:</p></div>
 <div class="imageblock" style="text-align:center;">
 <div class="content">
-<img src="images/PrintDiveLog.jpg" alt="FIGURA: Dialogo de impresión" />
+<img src="images/Print1_f22.jpg" alt="FIGURA: Diálogo de imresión" />
 </div>
 </div>
-<div class="paragraph"><p>En Tipo de impresión habrá que seleccionar una de las cuatro opciones</p></div>
+<div class="olist arabic"><ol class="arabic">
+<li>
+<p>
+En <em>Tipo de impresión</em> seleccionar una de las dos opciones:
+</p>
 <div class="ulist"><ul>
 <li>
 <p>
-Imprimir la lista de inmersiones. Para ello se selecciona Impresión de tabla.
+<em>Impresión de lista de inmersiones</em>: Imprime buceos de la <strong>Lista de inmersiones</strong>
+con perfiles y otra información.
 </p>
 </li>
 <li>
 <p>
-Imprimir los registros de buceo completos (perfiles y resto de información) a
-  6 inmersiones por página. Para ello se selecciona <em>6 inmersiones por página</em>.
-</p>
-</li>
-<li>
-<p>
-Imprimir los registros de buceo completos (perfiles y resto de información) a
-  2 inmersiones por página. Para ello se selecciona <em>2 inmersiones por página</em>.
-</p>
-</li>
-<li>
-<p>
-Imprimir los registros de buceo completos (perfiles y resto de información) a
-  1 inmersión por página. Para ello se selecciona  <em>1 inmersión por página</em>.
+<em>Impresión de estadísticas</em>: Imprime estadísticas anuales de las inmersiones.
 </p>
 </li>
 </ul></div>
-<div class="paragraph"><p>En Opciones de impresión habrá que seleccionar:</p></div>
+</li>
+<li>
+<p>
+En <em>Opciones de impresión</em> seleccionar:
+</p>
 <div class="ulist"><ul>
 <li>
 <p>
-Imprimir solo los buceos que han sido seleccionados de la lista de inmersiones
-  antes de activar el diálogo de impresión. Para ello se activa la opción
-  <em>Imprimir solo inmersiones seleccionadas</em>.
+<em>Imprimir solo inmersiones seleccionadas</em>. Se imprimirán solo las inmersiones de
+la lista que se hubieran seleccionado previamente. Si no se activa esta casilla,
+se imprimirán <strong>todas</strong> las inmersiones del registro.
 </p>
 </li>
 <li>
 <p>
-Imprimir en color. Para ello se selecciona la opción <em>Impresión en color</em>.
+<em>Impresión en color</em>.  Si no se selecciona se imprimirá en escala de grises
+(blanco y negro).
 </p>
 </li>
 </ul></div>
-<div class="paragraph"><p>La opción <em>Ordenar</em> afecta a la disposición de la página (o parte de ella) para
-cada inmersión. El perfil de buceo puede imprimirse en la parte alta de cada
-inmersión con el texto debajo, o puede imprimirse el texto en la parte de arriba
-con el perfil debajo. Seleccionar la opción preferida en el diálogo de
-impresión. Ver la imagen a continuación la cual presenta el texto sobre el
-perfil.</p></div>
-<div class="paragraph"><p>El usuario puede <em>Previsualizar</em> la página impresa seleccionando el botón
-<em>Previsualizar</em> del diálogo. Después de previsualizar, se pueden hacer cambios
-en las opciones del diálogo de impresión para ajustarlas a los gustos
-personales.</p></div>
-<div class="paragraph"><p>Ahora se selecciona el botón <em>Imprimir</em> del diálogo. Esto lanzará el diálogo de
-impresión habitual usado por el sistema operativo del usuario (imagen [<strong>B</strong>] en
-el centro, arriba), que le permitirá elegir una impresora y ajustar sus
-propiedades (imagen [<strong>C</strong>] a la derecha, arriba). Es muy importante ajustar la
-resolución de la impresora a un valor apropiado cambiándolo en las propiedades
-de la impresora. Finalmente, el usuario puede imprimir las inmersiones. A
-continuación hay un ejemplo (bastante pequeño) de la salida de una impresión.</p></div>
+</li>
+<li>
+<p>
+En <em>Plantilla</em> seleccionar una plantilla que usar como distribución de la
+página. Existen varias plantillas (ver imagen <strong>B</strong> anterior).
+</p>
+<div class="ulist"><ul>
+<li>
+<p>
+<em>Table</em>: Se imprime una tabla resumen de todas las inmersiones seleccionadas
+(ver imagen).
+</p>
+</li>
+</ul></div>
+</li>
+</ol></div>
+<div class="imageblock" style="text-align:center;">
+<div class="content">
+<img src="images/Print_summarylist_f22.jpg" alt="FIGURA: Imprimir tabla resumen" />
+</div>
+</div>
+<div class="ulist"><ul>
+<li>
+<p>
+<em>Flow layout</em>: Imprime el texto asociado a cada inmersión, sin imprimir los
+perfiles de los buceos (ver imagen):
+</p>
+</li>
+</ul></div>
+<div class="imageblock" style="text-align:center;">
+<div class="content">
+<img src="images/Print_flow_layout_f22.jpg" alt="FIGURE: Print flow layout" />
+</div>
+</div>
+<div class="paragraph"><p>-<em>One Dive</em>: Imprime una inmersión por página, mostrando el perfil (ver imagen)</p></div>
+<div class="imageblock" style="text-align:center;">
+<div class="content">
+<img src="images/print2_f22.jpg" alt="FIGURE: Print one dive / page" />
+</div>
+</div>
+<div class="ulist"><ul>
+<li>
+<p>
+<em>Two Dives</em>: Imprime dos inmersiones por página mostrando los perfiles.
+</p>
+</li>
+<li>
+<p>
+<em>Six Dives</em>: Imprime seis inmersiones por página mostrando los perfiles.
+</p>
+</li>
+<li>
+<p>
+<em>Custom</em>: Esta opción permite customizar el contenido y su distrinbución. Este
+tipo se comentará al final de esta sección.
+</p>
+</li>
+</ul></div>
+<div class="paragraph"><p>Los usuarios pueden <em>Previsualizar</em> la página a imprimir pulsando el botón
+<em>Previsualizar</em> del diálogo (ver imagen <strong>A</strong> al inicio de la sección). Tras
+visualizar , se pueden efectuar cambios en las opciones del diálogo de impresión,
+hasta completar una distribución que se ajuste al gusto personal.</p></div>
+<div class="paragraph"><p>A continuación, selecciona el botón <em>Imprimir</em> (ver imagen <strong>A</strong> al inicio de
+esta sección). Esto activa el diálogo normal de impresión del sistema
+operativo, que nos permitirá elegir la impresora y configurar sus propiedades.</p></div>
+<div class="imageblock" style="text-align:center;">
+<div class="content">
+<img src="images/Print_print_f22.jpg" alt="FIGURE: Print one dive / page" />
+</div>
+</div>
+<div class="paragraph"><p>Ajusta la resolución de la impresora a un valor apropiado modificando sus
+propiedades . Finalmente selecciona el botón <em>Print</em> para imprimir los buceos.
+A continuación un ejemplo (bastante pequeño) de la salida de una página.</p></div>
 <div class="imageblock" style="text-align:center;">
 <div class="content">
 <img src="images/Printpreview.jpg" alt="FIGURE: Previsualización de impresión" />
 </div>
 </div>
+<div class="sect2">
+<h3 id="_escribir_una_plantilla_de_impresion_a_medida_avanzado">11.1. Escribir una plantilla de impresión a medida (avanzado)</h3>
+<div class="paragraph"><p>Escribir una plantilla a medida es una forma efectiva de producir impresiones
+altamente personalizadas. Subsurface utiliza plantillas HTML con Grantlee como
+sistema de impresión. Se puede crear una plantilla, exportar una nueva plantilla,
+importar una existente o borrarla. Ver el <a href="#S_APPENDIX_E">APÉNDICE E</a> para ver
+como escribir o modificar una plantilla.</p></div>
+</div>
 </div>
 </div>
 <div class="sect1">
@@ -3853,10 +4154,31 @@ finalmente decide no hacer los cambios.</p></div>
 <li>
 <p>
 <strong>Inmersiones</strong>: En este bloque se especifica la carpeta y nombre de archivo
-    del registro de buceo electrónico. Es un archivo con extensión .xml. Al iniciar
+    del registro de buceo electrónico. Es un archivo con extensión .xml o .ssrf. Al iniciar
     <em>Subsurface</em> sin argumentos cargará automáticamente el registro especificado
-    aquí.
+    aquí. Existen tres opciones:
 </p>
+<div class="ulist"><ul>
+<li>
+<p>
+<em>Sin archivo por defecto</em>: Si se selecciona, <em>Subsurface</em> no abre ningún
+      archivo automáticamente al iniciarse
+</p>
+</li>
+<li>
+<p>
+<em>Archivo por defecto local</em>: Si se selecciona, <em>Subsurface</em> abre un archivo
+      del disco duro local al iniciarse.
+</p>
+</li>
+<li>
+<p>
+<em>Archivo por defecto en la nube</em>: Si se selecciona, <em>Subsurface</em> abre el
+      divelog en la nube que se inicializó desde la pestaña <em>Red</em> de las
+      <strong>Preferencias</strong> (ver a continuación).
+</p>
+</li>
+</ul></div>
 </li>
 <li>
 <p>
@@ -3869,7 +4191,7 @@ finalmente decide no hacer los cambios.</p></div>
 <li>
 <p>
 <strong>Botella por defecto</strong>: Se puede especificar una botella por defecto de las
-    que aparecen listadas en la pestaña <strong>Equipo</strong> del panel <strong>Notas de la inmersión</strong>.
+    que aparecen listadas en la pestaña <strong>Equipo</strong> del panel <strong>Notas</strong>.
     Es muy cómodo si se bucea habitualmente con el mismo tipo de botella, asigna a
     cada nueva inmersión una botella del tipo aquí definido.
 </p>
@@ -3913,10 +4235,15 @@ profundidad, presión, volumen, temperatura y masa. Al seleccionar el botón de
 Métrico o Imperial de arriba, el usuario indica que todas las unidades vayan en
 las correspondientes al sistema elegido. Como alternativa, si se selecciona
 <strong>Personalizar</strong> se pueden mezclar, con algunas medidas en métrico y otras en
-imperial. En la opción Unidades de tiempo se puede elegir si se desea que las
+imperial.</p></div>
+<div class="paragraph"><p>Independientemente de los ajustes citados, en la opción <em>Unidades de tiempo</em>
+se puede elegir si se desea que las
 velocidades de ascenso/descenso se muestren en m/s o en m/min. Los buzos con
 botella, habitualmente, manejan velocidades en m/min, sin embargo, los apneístas
-ascienden mucho más deprisa por lo que suelen utilizar velocidades en m/s.</p></div>
+ascienden mucho más deprisa por lo que suelen utilizar velocidades en m/s.
+Igualmente, las coordenadas GPS pueden representarse de la forma tradiciona
+(grados, minutos, segundos) o como grados con decimales, elige la más adecuada
+a tus necesidades.</p></div>
 </div>
 <div class="sect2">
 <h3 id="_grafico">13.3. Gráfico</h3>
@@ -3935,19 +4262,27 @@ ascienden mucho más deprisa por lo que suelen utilizar velocidades en m/s.</p><
 <div class="ulist"><ul>
 <li>
 <p>
-Umbrales: <em>Subsurface</em> puede mostrar las presiones parciales de nitrógeno,
+<em>Umbrales</em>: <em>Subsurface</em> puede mostrar las presiones parciales de nitrógeno,
    oxígeno y helio durante el buceo. Se activan utilizando la barra de herramientas
    de la izquierda de panel <strong>Perfil de inmersión</strong>. Para cada uno de estos gases,
    los usuarios puede especifica un valor umbral a la derecha en el panel de
    Preferencias. Si cualquiera de los gráficos sube por encima de este nivel,
    entonces el gráfico se resalta en rojo, indicando que se ha excedido dicho
-   umbral.
+   umbral de presión parcial.
+</p>
+</li>
+<li>
+<p>
+<em>Max pO<sub>2</sub> al mostrar PMO</em> es el valor usado para calcular la profundidad
+   máxima operativa (PMO) de un gas. Especifica una presión parcial apropiada.
+   Habitualmente se usa un valor de 1.4.
 </p>
 </li>
 <li>
 <p>
 <em>Trazar en rojo el techo informado por el ordenador de buceo</em>: Esta casilla
-   seleccionable permite exactamente lo que dice. No todos los ordenadores de buceo
+   seleccionable permite exactamente lo que dice. El color por defecto es blanco.
+   No todos los ordenadores de buceo
    facilitan los valores de los techos. Si el ordenador de buceo lo facilita, puede
    diferir de los techos calculados por <em>Subsurface</em>. Esto se debe al uso de
    diferentes algoritmos, diferentes factores de gradiente y a la forma dinámica en
@@ -3978,10 +4313,10 @@ Umbrales: <em>Subsurface</em> puede mostrar las presiones parciales de nitrógen
 <p>
 <strong>Varios</strong>:
 </p>
-<div class="ulist"><ul>
+<div class="ulist" id="GradientFactors_Ref"><ul>
 <li>
 <p>
-Factores de gradiente*: Aquí los usuarios puede fijar los <em>factores
+Factores de gradiente (GF_bajo y GF_alto)<strong>: Se fijan los <em>factores
    de gradiente</em> usados en la inmersión. El GF_bajo es el factor de gradiente a
    mayores profundidades y el GF_alto se usa justo debajo de la superficie. A
    profundidades intermedias se usan factores entre GF_bajo y GF_alto. Los factores
@@ -3990,8 +4325,8 @@ Factores de gradiente*: Aquí los usuarios puede fijar los <em>factores
    conservadurismo. Cuanto menor sea el valor de un factor de gradiente, más
    conservativos son los cálculos en relación a la carga de nitrógeno y más
    profundos serán los techos durante el ascenso. Factores de gradiente de 20/60
-   son considerados conservadores y valores de 60/90 se consideran agresivos.
-   Seleccionar la casilla <strong>GF bajo a la máxima profundidad</strong> hace que se use el
+   son considerados conservadores y valores de 70/90 se consideran agresivos.
+   Seleccionar la casilla *GF bajo a la máxima profundidad</strong> hace que se use el
    GF_bajo en la mayor profundidad de la inmersión. Si no se selecciona, GF_bajo se
    aplica a todas las profundidades mayores que la primera parada deco. Para más
    información, ver:
@@ -4034,15 +4369,15 @@ Factores de gradiente*: Aquí los usuarios puede fijar los <em>factores
 <p>
 <em>Setpoint del CCR por defecto para la planificación de inmersiones</em>:
    Especifica el setpoint de O<sub>2</sub> para planificar buceos con CCR. Este valor
-   determinará la pO<sub>2</sub> a mantener durante una inmersión. Este es el setpoint
-   que usa al inicio de la inmersión. Los cambios efectuados durante el buceo
-   se pueden añadir a través del menú contextual del perfil.
+   determinará la pO<sub>2</sub> a mantener durante una inmersión. Los cambios
+   efectuados durante el buceo se pueden añadir a través del menú contextual
+   del perfil.
 </p>
 </li>
 <li>
 <p>
 <em>pSCR Ratio de O<sub>2</sub> en el metabolismo</em>: Para un rebreather semicerrado (pSCR)
-   este es el volumen de oxígeno usado por el buceador cada minuto. Fija este
+   este es el volumen de oxígeno usado por el buceador en un minuto. Fija este
    valor para planificar buceos con pSCR y cálculos de descompresión.
 </p>
 </li>
@@ -4050,7 +4385,7 @@ Factores de gradiente*: Aquí los usuarios puede fijar los <em>factores
 <p>
 <em>pSCR Ratio</em>: En equipos pSCR el ratio de vertido es la cantidad de gas
    expulsada del circuito frente a la cantidad de gas recirculada en el circuito.
-   Fija este valor para planificar buceos con pSCR.
+   Fija este valor para planificar buceos con pSCR. Se suele usar un ratio 1:10
 </p>
 </li>
 </ul></div>
@@ -4077,25 +4412,66 @@ similares. Por ejemplo hay diversas variantes de inglés o francés.</p></div>
 <h3 id="_red">13.5. Red</h3>
 <div class="paragraph"><p>Este panel facilita la comunicación entre <em>Subsurface</em> y las fuentes de datos en
 internet.</p></div>
+<div class="paragraph"><p>Esto es importante cuando <em>Subsurface</em> tiene que comunicarse con servicios como
+el <a href="#S_Companion">servicio web de <em>Subsurface</em></a> o importar/exportar datos de
+<em>Divelogs.de</em>. El acceso a internet viene determinado por el tipo de conexión y
+por el proveedor de acceso (ISP) utilizado. El ISP debería proporcionar la
+información necesaria.</p></div>
 <div class="imageblock" style="text-align:center;">
 <div class="content">
 <img src="images/Pref5_f20.jpg" alt="FIGURA: página de preferencias de red" />
 </div>
 </div>
-<div class="paragraph"><p>Esto es importante cuando <em>Subsurface</em> tiene que comunicarse con servicios como
-el <a href="#S_Companion">servicio web de <em>Subsurface</em></a> o importar/exportar datos de
-<em>Divelogs.de</em>. El acceso a internet viene determinado por el tipo de conexión y
-por el proveedor de acceso (ISP) utilizado. El ISP debería proporcionar la
-información necesaria.
-Aquí hay que indicar la información necesaria si se utiliza un servidor proxy
-para el acceso a internet. El tipo de proxy se selecciona del desplegable, tras
-lo cual debe facilitarse la dirección IP del servidor y el número de puerto. Si
-el servidor proxy utiliza autenticación también han de indicarse el usuario y su
-password para que <em>Subsurface</em> pueda pasar automáticamente a través del proxy
-para acceder a internet.</p></div>
+<div class="paragraph"><p>Este diálogo tiene tres secciones:</p></div>
+<div class="ulist"><ul>
+<li>
+<p>
+<em>Tipo de proxy</em>:
+   Si se utiliza un servidor proxy para acceder a internet, el tipo de proxy se
+   selecciona del desplegable, tras
+   lo cual debe facilitarse la dirección IP del servidor y el número de puerto. Si
+   el servidor proxy utiliza autenticación también han de indicarse el usuario y su
+   password para que <em>Subsurface</em> pueda pasar automáticamente a través del proxy
+   para acceder a internet.
+</p>
+</li>
+<li>
+<p>
+<em>Almacenamiento en la nube de Subsurface</em>:
+   Para poder guardar nuestro divelog en la nube, se precisa una dirección
+   de correo electrónico y una password. Esto permite a <em>Subsurface</em> mandar
+   un correo electrónico al usuario con información de seguridad relativa al
+   almacenamiento en la nube. Tiene dos opciones adicionales:
+</p>
+<div class="ulist"><ul>
+<li>
+<p>
+<em>Sincronizar con la nube en segundo plano</em>: Permite guardar la información
+     en la nube mientras el usuario lleva a cabo otras tareas en <em>Subsurface</em>.
+</p>
+</li>
+<li>
+<p>
+<em>Guardar contraseña localmente</em>: Permite guardar la contraseña de acceso
+     a la nube en el disco duro. ¡¡¡ OJO !!! La contraseña se guarda en texto
+     plano sin encriptar.
+</p>
+</li>
+</ul></div>
+</li>
+<li>
+<p>
+<em>Servicio web de Subsurface</em>:
+   Al suscribirnos al <a href="#S_Companion">Servicio web de Subsurface</a>, se nos
+   facilita una identificación de usuario muy larga y dificil de recordar.
+   Este es el lugar donde guardarla. Seleccionando la opción, nos asegurammos
+   de tener una copia local de la misma.
+</p>
+</li>
+</ul></div>
 </div>
 <div class="sect2">
-<h3 id="_acceso_a_facebook">13.6. Acceso a Facebook</h3>
+<h3 id="S_Facebook">13.6. Acceso a Facebook</h3>
 <div class="paragraph"><p>Este panel nos permite acceder a una cuenta de <em>Facebook</em> para poder enviar
 información desde <em>Subsurface</em>.</p></div>
 <div class="imageblock" style="text-align:center;">
@@ -4110,6 +4486,12 @@ tiene ningún efecto, en estos momentos.
 Ver la sección <a href="#S_facebook">Exportar perfiles de inmersión a Facebook</a>
 para más información.</p></div>
 </div>
+<div class="sect2">
+<h3 id="_georefencia">13.7. Georefencia</h3>
+<div class="paragraph"><p><em>Subsurface</em> proporciona un servicio de búsqueda geográfica (Esto es, la
+capacidad de buscar el nombre de un lugar, en base a unas coordenadas
+geográficas).</p></div>
+</div>
 </div>
 </div>
 <div class="sect1">
@@ -4176,7 +4558,7 @@ Un usuario que no este completamente seguro de cualquiera de los requisitos
 en varias secciones (ver imagen a continuación). Los parámetros de ajuste de una
 inmersión se introducen en las diversas secciones a la izquierda de la pantalla.
 El ajuste se divide en varias secciones: Gases disponibles, Ritmos, Planificar,
-Opciones de gases y Notas de inmersión.</p></div>
+Opciones de gases y Notas.</p></div>
 <div class="paragraph"><p>Arriba a la derecha hay un <strong>panel de diseño</strong> verde sobre el cual puede
 manipularse directamente el perfil de inmersión arrastrando y haciendo clic como
 se explica a continuación. Esta característica hace al planificador de
@@ -4192,12 +4574,12 @@ cualquier mensaje de aviso sobre el plan de buceo.</p></div>
 </div>
 </div>
 <div class="sect2">
-<h3 id="_inmersiones_con_circuito_abierto_como_ejemplo_de_planificacion_de_buceo">14.2. Inmersiones con circuito abierto como ejemplo de planificación de buceo</h3>
+<h3 id="_inmersiones_con_circuito_abierto">14.2. Inmersiones con circuito abierto</h3>
 <div class="ulist"><ul>
 <li>
 <p>
-En la parte de abajo a la izquierda del planificador (círculo azul en la
-  a continuación) hay un desplegable con tres opciones. Selecciona la correcta
+En la parte de abajo al centro del planificador (círculo azul en la imágen
+  anterior) hay un desplegable con tres opciones. Selecciona la correcta
   entre ellas:
 </p>
 <div class="ulist"><ul>
@@ -4220,18 +4602,18 @@ pSCR
 </li>
 <li>
 <p>
-En el area de arriba a la izquierda de la pantalla del planificador, hay que
+En el área de arriba a la izquierda de la pantalla del planificador, hay que
   asegurarse de que los parámetros constantes son correctos. Son: Fecha y hora
   de inicio de la inmersión, Presión atmosférica, y altura sobre el nivel del
   mar. Estos dos últimos están relacionados, variando uno se modifica el otro.
-  La presión atmosférica por defecto son 1.013 bar.
+  La presión atmosférica por defecto a nivel del mar son 1.013 bar.
 </p>
 </li>
 <li>
 <p>
 En la tabla etiquetada como <em>Gases disponibles</em>, añadir la información de las
   botellas que se han de utilizar y la composición de los gases de cada botella.
-  Esto se hace de forma similar a <a href="#S_CylinderData">como se rellena la información   de botellas en un diario</a>. Se elige el tipo de botella de la lista desplegable
+  Esto se hace de forma similar a <a href="#cylinder_definitions">como se rellena la información   de botellas en un diario</a>. Se elige el tipo de botella de la lista desplegable
   y se especifica la presión de trabajo de la botella. Si dejamos en blanco la
   concentración de oxígeno (O2%) se asume que el gas que contiene es aire. En otro
   caso, se introducen las concentraciones de oxígeno y/o helio en las casillas del
@@ -4241,23 +4623,168 @@ En la tabla etiquetada como <em>Gases disponibles</em>, añadir la información
 </li>
 <li>
 <p>
-El diálogo llamado <em>Puntos del planificador</em> no se utiliza, normalmente, en
-  esta etapa de la planificación.
+El perfil del buceo a planificar se puede crear de dos maneras:
+</p>
+<div class="ulist"><ul>
+<li>
+<p>
+Arrastrar los puntos del perfil
+   (los pequeños círculos blancos) para que representen la inmersión. Se pueden
+   crear puntos adicionales haciendo doble-clic sobre el perfil de buceo. Se
+   pueden borrar haciendo clic-derecho en un punto concreto y seleccionando
+   <em>borrar</em> en el menú contextual.
+</p>
+</li>
+<li>
+<p>
+La forma más eficiente de crear un perfil es introducir los valores
+   apropiados en la tabla llamada <em>Puntos del planificador de inmersiones</em>.
+   La primera línea de la tabla representa la duración y profundidad final
+   de un descenso desde superficie. Los segmentos siguientes describirán la
+   fase de fondo de la inmersión. La columna <em>CC set point</em> solo es relevante
+   para para buceadores en circuito cerrado.
+   El ascenso, normalmente, no se especifica, ya que esto es lo que se supone
+   que el planificador debe calcular.
+   Añade segmentos adicionales al perfil utilizando el icono "+" arriba a la
+   derecha de la tabla. Los segmentos introducidos en la tabla aparecen de
+   forma automática en el diagrama "Perfil de la inmersión".
 </p>
 </li>
 </ul></div>
-<div class="paragraph"><p><strong>La planificación se efectúa en tres pasos</strong>:</p></div>
+</li>
+</ul></div>
+<div class="sect3">
+<h4 id="_inmersiones_recreativas">14.2.1. Inmersiones recreativas</h4>
+<div class="paragraph"><p>El planificador de <em>Subsurface</em> ofrece una forma sofisticada de planificar
+inmersiones recreativas, p.e. inmersiones que permanezcan dentro de lis límites
+de no descompresión.
+El planificador  tiene en cuenta automáticamente la carga nitrógeno acumulada
+en inmersiones previas. Sin embargo, las tablas convencionales también tienen
+en cuenta los buceos anteriores ¿Por qué utilizar un planificador para buceos
+recreativos? Al utilizar las tablas recreativas se tiene en cuenta la máxima
+profundidad de una inmersión. Sin embargo, pocas inmersiones se efectúan a
+una profundidad constante que corresponda con la máxima (perfil "cuadrado").
+Esto supone que las tablas sobre estiman la carga de nitrógeno acumulada de
+las inmersiones previas. El planificador de <em>Subsurface</em> calcula la carga de
+nitrógeno de acuerdo con los perfiles reales de las inmersiones anteriores de
+forma similar a como lo hacen los ordenadores de buceo durante la inmersión.
+Esto significa que el buceador es "bonificado" por no permanecer a profundidad
+máxima en las inmersiones anteriores, permitiendo planificar una inmersión
+posterior más larga. Para que el planificador funcione es, pues, crucial haber
+descargado a <em>Subsurface</em> todas las inmersiones anteriores antes de hacer la
+planificación.</p></div>
+<div class="paragraph"><p>Para planificar un buceo, es necesario definir los ajustes apropiados.</p></div>
+<div class="ulist"><ul>
+<li>
+<p>
+Asegurarse de que el día y la hora se han ajustado a los de la inmersión
+planeada. Esto permite calcular la carga de nitrógeno de los buceos anteriores.
+</p>
+</li>
+<li>
+<p>
+Justo bajo la cabecera <em>Planificar</em> hay dos casillas seleccionables
+  <em>Recreativo</em> y <em>Parada de seguridad</em>. Para inmersiones recreativas se seleccionan
+  ambas casillas.
+</p>
+</li>
+<li>
+<p>
+Luego se define el tamaño de las botellas, la mezcla de gas (aire o % de
+  oxígeno) y la presión inicial de las botellas en la parte superior izquierda
+  del planificador, en <em>Gases disponibles</em>.
+</p>
+</li>
+<li>
+<p>
+El planificador calcula si la botella elegida contiene suficiente aire/gas
+  para completar la inmersión planeada. Para que esto sea realista, bajo
+  <em>Opciones de gases</em>, se especifica un consumo de aire en superficie (CAS)
+  adecuado para la opción <em>CAS en fondo</em>. Los valores adecuados se situarían
+  entre 15 l/min y 30 l/min, siendo para buceadores noveles o buceos difíciles
+  próximos a 30 l/min.
+</p>
+</li>
+<li>
+<p>
+Definir la cantidad de gas que se pretende que sobre en la botella al final
+  de la inmersión, justo antes de iniciar el asceso. Se suele usar un valor de
+  50 bar.
+</p>
+</li>
+<li>
+<p>
+Definir la profundidad de la inmersión arrastrando los puntos blancos en el
+  perfil o introduciendo la profundidad en la tabla que se encuentra en <em>Puntos
+  del planificador de inmersiones</em>. Si se tratara de una inmersión multinivel,
+  se añaden los puntos necesarios que representen el plan, bien añadiéndolos en
+  el perfil de la inmersión, bien en la tabla citada.
+</p>
+</li>
+<li>
+<p>
+Se puede modificar la velocidad de ascenso. Las velocidades de ascenso
+  establecidas por defecto son aquellas consideradas seguras para el buceo
+  recreativo.
+</p>
+</li>
+<li>
+<p>
+El perfil del planificador indica el tiempo máximo de inmersión dentro de
+los límites de no descompresión, utilizando el algoritmo Bülmann ZH-L16 y el
+gas y la profundidad especificados como se ha descrito anteriormente. El
+planificador de <em>Subsurface</em> permite una visualización rápida de la duración
+de una inmersión en función de la profundidad, teniendo en cuenta la carga de
+nitrógeno residual resultante de las inmersiones previas. El plan de buceo
+incluye una estimación de la cantidad de aire/gas que se va a utilizar,
+dependiendo de los ajustes de las botellas especificadas en <em>Gases disponibles</em>.
+Si la presión inicial de la botella se ajusta a "0", la duración del buceo que
+se mostrará será el auténtico límite de no descompresión (LND) sin tener en
+cuenta el gas utilizado durante la inmersión. Si la superficie sobre el perfil
+se vuelve roja, significa que se han sobrepasado los límites del buceo recreativo
+y se necesita reducir, bien la profundidad, bien la duración.
+</p>
+</li>
+</ul></div>
+<div class="paragraph"><p>A continuación se muestra una imagen de un plan para una inmersión recreativa
+a 30 metros. Aunque el límite de no descompresión es 23 minutos, la duración
+del buceo se ve limitada por la cantidad de aire en la botella, reflejada por
+la ventana de texto informativa abajo a la derecha del panel en la que se nos
+indica que no existe suficiente gas para compartir con el compañero durante el
+ascenso.</p></div>
+<div class="imageblock" style="text-align:center;">
+<div class="content">
+<img src="images/rec_diveplan.jpg" alt="FIGURE: A recreational dive plan: setup" />
+</div>
+</div>
+</div>
+<div class="sect3">
+<h4 id="_inmersiones_en_circuito_abierto_no_recreativas_incluyendo_descompresion">14.2.2. Inmersiones en circuito abierto no recreativas, incluyendo descompresión</h4>
+<div class="paragraph"><p>La planificación no recreativa supone exceder los límites de no descompresión
+y/o utilizar múltiples gases.  Tales inmersiones se planifican en tres fases:</p></div>
 <div class="paragraph"><p><strong>a) Control de gases inertes</strong>: Esto se consigue especificando las velocidades
-de descenso y ascenso, así como los factores de gradiente (GF bajo y GF alto)
-bajo los encabezamientos <em>Velocidades</em> y <em>Planificar</em> en la parte inferior de la
-pantalla de planificación. En principio se utilizan los factores de gradiente
-especificados en la pantalla de <em>Preferencias</em> de <em>Subsurface</em>. Si se modifican
-en el planificador(ver <em>Opciones de gases</em>), se utilizan los nuevos valores sin
-modificar los marcados en las <em>Preferencias</em>. Los ajustes de los factores de
-gradiente afectan enormemente a los techos calculados y sus profundidades.
+de descenso y ascenso, así como el modelo descompresivo (GF bajo y GF alto o
+nivel de conservadurismo) bajo los encabezamientos <em>Velocidades</em> y <em>Planificar</em>
+en la parte inferior de la pantalla de planificación. Están soportados dos
+modelos descompresivos, el modelo Bühlmann y el modelo VPM-B. Elige uno de los
+dos modelos. Si se selecciona el modelo Bühlmann, se necesita especificar los
+factores de gradiente (GF_alto y GF_bajo). En principio se utilizarán los
+factores de gradiente especificados en la pantalla de <em>Preferencias</em> de
+<em>Subsurface</em>. Si se modifican en el planificador(ver <em>Opciones de gases</em>), se
+utilizan los nuevos valores sin modificar los marcados en las <em>Preferencias</em>.
+Los ajustes de los factores de gradiente afectan enormemente a los techos
+calculados y sus profundidades.
 Un <em>GF bajo</em> muy pequeño produce paradas de descompresión más pronto durante la
 inmersión.
-Para más información externa a este manual ver:</p></div>
+** Para más información sobre factores de gradiente visita la sección
+<a href="#S_GradientFactors">Ajustes de la Preferencias de factores de gradiente</a>.</p></div>
+<div class="paragraph"><p>Si se seleccioná ell modelo VPM-B, es necesario especificar el nivel de
+conservadurismo, en una escala de 0 (menos conservador) a 4 (más conservador).
+Este modelo tiende a dar paradas deco a mayores profundidades que el modelo de
+Bühlmann y, a menudo, produce perfiles ligeramente más cortos que este último.
+Cuando elijas uno de los modelos, recuerda que no son modelos fisiológicos
+exactos, sino modelos matemáticos que parecen funcionar en la práctica.</p></div>
+<div class="paragraph"><p>Para más información externa a este manual ver:</p></div>
 <div class="ulist"><ul>
 <li>
 <p>
@@ -4271,7 +4798,7 @@ Para más información externa a este manual ver:</p></div>
 </li>
 <li>
 <p>
-<a href="http://www.amazon.com/Deco-Divers-Decompression-Theory-Physiology/dp/1905492073/ref=sr_1_1?s=books&amp;ie=UTF8&amp;qid=1403932320&amp;sr=1-1&amp;keywords=deco+for+divers"><em>Deco for Divers</em>, by Mark Powell (2008). Aquapress, Southend-on-Sea, UK. ISBN 10:1-905492-07-3. Un excelente estudio no técnico.</a>
+<a href="http://www.amazon.com/Deco-Divers-Decompression-Theory-Physiology/dp/1905492073/ref=sr_1_1?s=books&amp;ie=UTF8&amp;qid=1403932320&amp;sr=1-1&amp;keywords=deco+for+divers"><em>Deco for Divers</em>, by Mark Powell (2008). Aquapress</a> Southend-on-Sea, UK. ISBN 10:1-905492-07-3. Un excelente estudio no técnico en el que se discuten ambos modelos, el de Bühlmann y el VPM-B.
 </p>
 </li>
 </ul></div>
@@ -4356,7 +4883,7 @@ guardado aparecerá en el panel <strong>Lista de Inmersiones</strong>.</p></div>
 <div class="paragraph"><p>En la parte inferior derecha del planificador, bajo el encabezamiento <em>Detalles
 del plan de buceo</em>, se proporcionan los detalles exactos del plan de inmersión.
 Estos detalles pueden modificarse seleccionando cualquiera de las opciones bajo
-el encabezamiento <em>Notas de la inmersión</em> del planificador, justo a la izquierda
+el encabezamiento <em>Notas</em> del planificador, justo a la izquierda
 del anterior. Si se solicita un <em>Plan de buceo detallado</em>, se obtendrá un plan
 detallado al nivel de oraciones. Si cualquiera de los límites especificados se
 sobrepasa, se obtendrá un mensaje de aviso bajo la información del plan.</p></div>
@@ -4366,8 +4893,34 @@ Esta duración INCLUYE el tiempo de transición hasta llegar al nivel. Sin
 embargo, si se selecciona <em>Mostrar transiciones en deco</em>, las transiciones se
 muestran separadamente de las duraciones de las paradas en cada nivel.</p></div>
 </div>
+</div>
 <div class="sect2">
-<h3 id="_planificar_inmersiones_con_ccr">14.3. Planificar inmersiones con CCR</h3>
+<h3 id="_planificar_inmersiones_con_pscr">14.3. Planificar inmersiones con pSCR</h3>
+<div class="paragraph"><p>Para planificar una inmersión usando un rebreather pasivo de circuito
+semi-cerrado, selecciona <em>pSCR</em> en lugar de <em>Circuito abierto</em> en la lista
+desplegable.
+Los parámetros para la inmersción con pSCR se pueden ajustar seleccionando
+<em>Archivo &#8594; Preferencias &#8594; Gráfico</em> desde el menú principal, donde el cálculo
+de consumo de gas tiene en cuenta el ratio de vertido (por defecto 10:1) así
+como el ratio de metabolismo. El cálculo también tiene en cuenta la pérdida
+de oxígeno por la boquilla del rebreather. Si la pO<sub>2</sub> cae por debajo de lo que
+se considera un valor seguro, aparecerá un aviso en los <em>Detalles del plan de
+buceo</em>.  Una configuración típica con pSCR es con una sola botella y una o más
+botellas de emergencia. Así pues, el ajuste de las tablas de <em>Gases disponibles</em>
+y <em>Puntos del planificador</em> son muy similares a las de un plan con CCR, como se
+ha descrito anteriormente. Sin embargo, no se especifican setpoints de oxígeno
+en las inmersiones con pSCR. A continuación hay un plan de inmersión para un
+buceo con pSCR. El buceo es comparable al anterior con CCR, pero hay que hacer
+notar la mayor duración del ascenso debido al menor contenido de oxígeno en el
+circuito por la caída de oxígeno en la boquilla del equipo pSCR.</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="_planificar_inmersiones_con_ccr">14.4. Planificar inmersiones con CCR</h3>
 <div class="paragraph"><p>Para planificar una inmersión utilizando un rebreather de circuito cerrado,
 selecciona la opción <em>CCR</em> en la lista desplegable (en un circulo azul en la
 imagen a continuación.</p></div>
@@ -4396,31 +4949,6 @@ pero, desde luego, lo hace para ascensos de emergencia en circuito abierto.</p><
 gas para un segmento en CCR, por tanto, lo normal es obtener valores de 0 l.</p></div>
 </div>
 <div class="sect2">
-<h3 id="_planificar_inmersiones_con_pscr">14.4. Planificar inmersiones con pSCR</h3>
-<div class="paragraph"><p>Para planificar una inmersión usando un rebreather pasivo de circuito
-semi-cerrado, selecciona <em>pSCR</em> en lugar de <em>Circuito abiertp</em> en la lista
-desplegable.
-Los parámetros para la inmersción con pSCR se pueden ajustar seleccionando
-<em>Archivo &#8594; Preferencias &#8594; Gráfico</em> desde el menú principal, donde el cálculo
-de consumo de gas tiene en cuenta el ratio de vertido (por defecto 10:1) así
-como el ratio de metabolismo. El cálculo también tiene en cuenta la pérdida
-de oxígeno por la boquilla del rebreather. Si la pO<sub>2</sub> cae por debajo de lo que
-se considera un valor seguro, aparecerá un aviso en los <em>Detalles del plan de
-buceo</em>.  Una configuración típica con pSCR es con una sola botella y una o más
-botellas de emergencia. Así pues, el ajuste de las tablas de <em>Gases disponibles</em>
-y <em>Puntos del planificador</em> son muy similares a las de un plan con CCR, como se
-ha descrito anteriormente. Sin embargo, no se especifican setpoints de oxígeno
-en las inmersiones con pSCR. A continuación hay un plan de inmersión para un
-buceo con pSCR. El buceo es comparable al anterior con CCR, pero hay que hacer
-notar la mayor duración del ascenso debido al menor contenido de oxígeno en el
-circuito por la caída de oxígeno en la boquilla del equipo pSCR.</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">14.5. Modificar un plan de inmersión existente</h3>
 <div class="paragraph"><p>Normalmente, cuando se ha guardado un plan de inmersión, se encuentra disponible
 desde la <strong>Lista de Inmersiones</strong> como cualquier buceo. Desde la <strong>Lista de
@@ -4455,7 +4983,7 @@ plan de buceo</em> para incluirlos en un archivo de texto o un procesador de
 textos.</p></div>
 <div class="paragraph"><p>Los planes de inmersión tienen muchas características en común con los registros
 de buceo (perfil, notas, etc). Despues de haber guardado un plan, los detalles y
-los calculos de gas quedan almacenados en la pestaña <strong>Notas de la inmersión</strong>.
+los calculos de gas quedan almacenados en la pestaña <strong>Notas</strong>.
 Mientras se está diseñando un plan, se puede imprimir utilizando el botón
 <em>Imprimir</em> del planificador. Esto imprimirá los detalles y cálculos de gases del
 panel <em>Detalles del plan de inmersión</em> del planificador. Sin embargo, tras haber
@@ -4490,11 +5018,23 @@ de este manual que describen las operaciones con más detalle.</p></div>
 </li>
 <li>
 <p>
+<em>Abrir almacenamiento en la nube</em> - Abre el diario previamente configurado en
+  <a href="#S_Cloud_storage"><em>Almacenamiento en la nube</em></a>.
+</p>
+</li>
+<li>
+<p>
 <em>Guardar</em> - Guarda el diario abierto en estos momentos.
 </p>
 </li>
 <li>
 <p>
+<em>Guardar en almacenamiento en la nube</em> - Guarda el diario actual en el
+  <a href="#S_Cloud_storage"><em>Almacenamiento en la nube</em></a>.
+</p>
+</li>
+<li>
+<p>
 <em>Guardar como</em> - Guarda el diario actual con un nombre de archivo diferente.
 </p>
 </li>
@@ -4522,6 +5062,13 @@ de este manual que describen las operaciones con más detalle.</p></div>
 </li>
 <li>
 <p>
+<a href="#S_FindMovedImages"><em>Encontrar imágenes movidas</em></a> - Si las fotos que se
+  hicieron durante las inmersiones se han cambiado de carpeta o de disco, las
+  localiza y las une alas inmersiones correspondientes.
+</p>
+</li>
+<li>
+<p>
 <a href="#S_Configure"><em>Configurar ordenador de buceo</em></a> - Edita la configuración de
   un ordenador de buceo.
 </p>
@@ -4573,13 +5120,19 @@ de este manual que describen las operaciones con más detalle.</p></div>
 </li>
 <li>
 <p>
+<em>Editar inmersión</em> - Edita una inmersión cuyo perfil se hizo manualmente y no
+  descargándola desde un ordenador de buceo.
+</p>
+</li>
+<li>
+<p>
 <a href="#S_DivePlanner"><em>Planificar inmersión</em></a> - Esta característica permite
   planificar inmersiones.
 </p>
 </li>
 <li>
 <p>
-<a href="#S_Replan"><em>Re-planificar inmersión</em></a> - Edita un plan de buceo que se ha
+<a href="#S_Replan"><em>Editar inmersión en planificador</em></a> - Edita un plan de buceo que se ha
   guardado en la <strong>Lista de Inmersiones</strong>.
 </p>
 </li>
@@ -4644,7 +5197,7 @@ de este manual que describen las operaciones con más detalle.</p></div>
 </li>
 <li>
 <p>
-<a href="#S_ViewPanels"><em>Info</em></a> - Se visualiza solo el panel Notas de la inmersión.
+<a href="#S_ViewPanels"><em>Info</em></a> - Se visualiza solo el panel Notas.
 </p>
 </li>
 <li>
@@ -4660,12 +5213,13 @@ de este manual que describen las operaciones con más detalle.</p></div>
 </li>
 <li>
 <p>
-<em>Anterior ordenador</em> - Cambia al siguiente ordenador de buceo.
+<em>Anterior ordenador</em> - Si una inmersión se ha registrado con más de un ordenador
+  de buceo, cambia a los datos del anterior ordenador de buceo.
 </p>
 </li>
 <li>
 <p>
-<em>Siguiente ordenador</em> - Cambia al anterior ordenador de buceo.
+<em>Siguiente ordenador</em> - Cambia al siguiente ordenador de buceo.
 </p>
 </li>
 <li>
@@ -4693,7 +5247,8 @@ de este manual que describen las operaciones con más detalle.</p></div>
 <li>
 <p>
 <a href="#S_UserSurvey"><em>Encuesta de usuarios</em></a> - Ayuda a hacer mejor <em>Subsurface</em>
-  tomando parte en nuestra encuesta a usuarios.
+  tomando parte en nuestra encuesta a usuarios, o completando otra si tus hábitos
+  de buceo han cambiado.
 </p>
 </li>
 <li>
@@ -4847,14 +5402,14 @@ escritura para el puerto USB, el interface del ordenador de buceo puede
 conectarse y se debería poder importar las inmersiones.</p></div>
 </div>
 <div class="sect2">
-<h3 id="S_HowFindBluetoothDeviceName">16.3. Ajustar dispositivos con bluetooth</h3>
+<h3 id="S_HowFindBluetoothDeviceName">16.3. Ajustar manualmente dispositivos con bluetooth</h3>
 <div class="admonitionblock">
 <table><tr>
 <td class="icon">
 <img src="images/icons/bluetooth.jpg" alt="Note" />
 </td>
 <td class="content">Para ordenadores de buceo que se comunican por bluetooth como el Heinrichs
-Weikamp Frog o el Shearwater Predator and Petrel hay un procedimiento distinto
+Weikamp Frog o el Shearwater Predator y Petrel hay un procedimiento distinto
 para localizar los nombres de dispositivo con los que se comunicará
 <em>Subsurface</em>. En general consiste en estos pasos:</td>
 </tr></table>
@@ -4877,7 +5432,9 @@ fabricante. Si se está usando un Shearwater Predator/Petrel, hay que selecciona
 </p>
 </li>
 </ul></div>
-<div class="paragraph"><div class="title">En Windows:</div><p>Probablemente bluetooth ya esté activado. Para emparejar el dispositivo se
+<div class="sect3">
+<h4 id="_en_windows_2">16.3.1. En Windows:</h4>
+<div class="paragraph"><p>Probablemente bluetooth ya esté activado. Para emparejar el dispositivo se
 selecciona <em>Panel de Control → Dispositivos Bluetooth → Añadir dispositivo
 Inalámbrico</em>. Esto debería desplegar un diálogo que mostraría tu ordenador de
 buceo (en modo bluetooth) y te permitiría emparejarlo. El ordenador de buceo
@@ -4889,7 +5446,9 @@ tu ordenador de buceo. Si se mostraran varios puertos, utiliza el que diga
 puerto COM. Si no, introdúcelo manualmente.</p></div>
 <div class="paragraph"><p>Nota: Si tienes problemas descargando desde tu ordenador de buceo a otro
 software después, intenta borrar el emparejamiento y volverlo a hacer.</p></div>
-<div class="paragraph"><p>En MacOS:</p></div>
+</div>
+<div class="sect3">
+<h4 id="_en_macos">16.3.2. En MacOS:</h4>
 <div class="paragraph"><p>Clica en el símbolo Bluetooth en la barra de menú y selecciona <em>Configurar
 Dispositivo Bluetooth …</em>. Asegúrate de que tu ordenador de buceo está en modo
 upload; entonces debería mostrar la lista de dispositivos. Selecciónalo y pasa
@@ -4898,57 +5457,232 @@ para la configuración inicial.</p></div>
 <div class="paragraph"><p>Una vez que el emparejamiento está completo el dispositivo correcto se mostrará
 en el desplegable <em>Dispositivo o punto de montaje</em> del diálogo <strong>Importar</strong> de
 <em>Subsurface</em>.</p></div>
-<div class="paragraph"><div class="title">En Linux</div><p>Asegúrate de que tienes activado el ordenador con <em>Subsurface</em>. En las
+</div>
+<div class="sect3">
+<h4 id="_en_linux">16.3.3. En Linux</h4>
+<div class="paragraph"><p>Asegúrate de que tienes activado el ordenador con <em>Subsurface</em>. En las
 distribuciones más habituales esto debería ser cierto de entrada y el
-emparejamiento debería se facil. Por ejemplo, Gnome3 muestra un icono Bluetooth
-en la esquina superior derecha del escritorio donde se selecciona <em>Configurar un
-dispositivo nuevo …</em>. Esto debería mostrar un diálogo donde se podría
-seleccionar el ordenador de buceo (que ya debería estar en modo bluetooth) y
-emparejarlo. Si se requiere PIN, prueba a introducir <em>0000</em>.</p></div>
-<div class="paragraph"><p>En los pocos casos en que lo anterior no es cierto, dependiendo del sistema,
-tendrás que ejecutar <code>initd</code> o <code>systemd</code>. Esto podría ser diferente e incluso
-requerir cargar módulos específicos de tu hardware. Si tu sistema usa <code>systemd</code>,
-ejecuta sudo <code>systemctl start bluetooth.service</code> para activarlo. Si usas <code>initd</code>
-ejecuta algo como <code>sudo rc.config start bluetoothd</code> o <code>sudo
-/etc/init.d/bluetooth start</code>.</p></div>
-<div class="paragraph"><p>También se puede usar una aproximación manual utilizando estos comandos:</p></div>
+emparejamiento debería se fácil. Por ejemplo, Gnome3 muestra un icono Bluetooth
+a la derecha de la barra de tareas, arriba en la pantalla.
+Los usuarios han informado de dificultades con algunos controladores de
+Bluetooth. Si tienes un controlador incluido en el PC, prueba primero con
+este. Es más fácil si quitas cualquier receptor USB que tengas activado.
+Si tienes un receptor USB que viniera con el ordenador de buceo, prueba con
+este antes que con cualquier otro.</p></div>
+<div class="paragraph"><p>Configurar una conexión para descargar inmersiones desde tu ordenador de buceo
+con capacidad Bluetooth, tal como el <em>Shearwater Petrel</em>, todavía no es un
+proceso automatizado y requerirá generalmente la línea de comandos.
+Se trata esencialmente de un proceso en tres pasos.</p></div>
 <div class="ulist"><ul>
 <li>
 <p>
-<code>sudo hciconfig</code> muestra los dispositivos bluetooth disponibles en tu pc,
-   seguramente verás un hci0, si no intenta sudo <code>hcitool -a</code> para buscar
-   dispositivos inactivos y prueba <code>sudo hciconfig hci0 up</code> para activarlo.
+Activar el controlador Bluetooth y emparejarlo con el ordenador de buceo
 </p>
 </li>
 <li>
 <p>
-<code>sudo hcitool scanning</code> usa esto para tener una lista de clientes activos,
-   busca tu ordenador de buceo y recuerda la dirección MAC que aparecerá.
+Establecer una conexión RFCOMM
 </p>
 </li>
 <li>
 <p>
-<code>sudo bluez-simple-agent hci0 10:00:E8:C4:BE:C4</code> esto emparejará tu ordenador
-   de buceo con la pila bluetooth de tu PC, copia/pega la dirección MAC de la
-   salida del anterior <em>sudo hcitool scanning</em>.
+Descargar las inmersiones con <em>Subsurface</em>
 </p>
 </li>
 </ul></div>
-<div class="paragraph"><p>Desafortunadamente, en Linux el enlace con un dispositivo de comunicaciones ha
-de hacerse manualmente ejecutando:</p></div>
+<div class="paragraph"><p>Asegurarse de que el ordenador de buceo está en modo "upload". En el <em>Petrel</em>
+y <em>Petrel 2</em>, navega por el menú, selecciona <em>Dive Log</em>, luego <em>Upload log</em>. En
+la pantalla se leerá <em>Initializing</em>, luego <em>Wait PC 3:00</em> e iniciará una cuenta
+atrás. Una vez que la conexión esté establecida, en la pantalla se leerá
+<em>Wait CMD &#8230;</em> y la cuenta atrás seguirá. Cuando se descargue la inmersión a
+<em>Subsurface</em> en la pantalla se leerá <em>Sending</em> y luego <em>Sent dive</em>.</p></div>
+<div class="paragraph"><p>Para establecer la conexión, accede como root vía <code>sudo</code> o <code>su</code>.
+Se necesitan los permisos  correctos para descargar las inmersiones al PC. En la
+mayoría de los sistemas Linux, esto significa hacerse miembro del grupo dialout
+(de forma idéntica como con los ordenadores de buceo que utilizan un puerto USB,
+como se describía en la sección anterior). En la línea de comando introduce:</p></div>
+<div class="paragraph"><p><code>sudo usermod -a -G dialout username</code></p></div>
+<div class="paragraph"><p>Luego desconecta el usuario y vuélvelo a conectar para que tenga efecto la
+modificación.</p></div>
+<div class="sect4">
+<h5 id="_activar_el_controlador_bluetooth_y_emparejar_el_ordenador_de_buceo">Activar el controlador Bluetooth y emparejar el ordenador de buceo</h5>
+<div class="paragraph"><p>Intenta configurar el controlador Bluetooth y emparejar tu ordenador de buceo
+utilizando el entorno gráfico del sistema operativo. Tras configurar el
+ordenador de buceo en modo "upload", haz clic en el icono Bluetooth en la
+barra del sistema y selecciona <em>Añadir nuevo dispositivo</em>. El ordenador de
+buceo debería aparecer. Si se pide una contraseña, introduce 0000. Anótate o
+copia la dirección MAC de tu ordenador de buceo, que necesitaremos más
+adelante, y debería ser de la forma  00:11:22:33:44:55.</p></div>
+<div class="paragraph"><p>Si el método gráfico no funcionó, empareja el dispositivo desde la línea de
+comandos. Abre un terminal y usa <code>hciconfig</code> para comprobar el estado del
+controlador Bluetooth</p></div>
+<div class="literalblock">
+<div class="content">
+<pre><code>$ hciconfig
+hci0:   Type: BR/EDR  Bus: USB
+        BD Address: 01:23:45:67:89:AB  ACL MTU: 310:10  SCO MTU: 64:8
+        *DOWN*
+        RX bytes:504 acl:0 sco:0 events:22 errors:0
+        TX bytes:92 acl:0 sco:0 commands:21 errors:0</code></pre>
+</div></div>
+<div class="paragraph"><p>Esto indica un controlador Bluetooth con dirección MAC 01:23:45:67:89:AB,
+conectado como hci0. Su estado es DOWN, por ejemplo no activado. Otros
+controladores adicionales aparecerían como hci1, etc. Si no había un receptor
+Bluetooth conectado al PC en el momento del arranque, hci0 es, probablemente,
+el receptor interno.
+Ahora conectemos el controlador y activemos la autenticación:</p></div>
+<div class="literalblock">
+<div class="content">
+<pre><code>sudo hciconfig hci0 up auth  (enter password when prompted)
+hciconfig
+hci0:  Type: BR/EDR  Bus: USB
+        BD Address: 01:23:45:67:89:AB  ACL MTU: 310:10  SCO MTU: 64:8
+        *UP RUNNING PSCAN AUTH*
+        RX bytes:1026 acl:0 sco:0 events:47 errors:0
+        TX bytes:449 acl:0 sco:0 commands:46 errors:0</code></pre>
+</div></div>
+<div class="paragraph"><p>Comprueba que el estado ahora incluye <code><em>UP</em>, <em>RUNNING</em> y <em>AUTH</em></code>.</p></div>
+<div class="paragraph"><p>If se están ejecutando múltiples controladores, lo más simple es desconectar
+los no utilizados, por ejemplo, para <code>hci1</code>:</p></div>
+<div class="literalblock">
+<div class="content">
+<pre><code>sudo hciconfig hci1 down</code></pre>
+</div></div>
+<div class="paragraph"><p>El próximo paso es <em>trust</em> y <em>pair</em> el ordenador de buceo. En distribuciones
+con Bluez 5, como Fedora 22, se puede utilizar una herramienta llamada
+<code>blutoothctl</code>, que lanzará su propia linea de comandos.</p></div>
+<div class="literalblock">
+<div class="content">
+<pre><code>bluetoothctl
+[NEW] Controller 01:23:45:67:89:AB localhost.localdomain [default]
+[bluetooth]# agent on
+Agent registered
+[bluetooth]# default-agent
+Default agent request successful
+[bluetooth]# scan on                        &lt;----now set your dive computer to upload mode
+Discovery started
+[CHG] Controller 01:23:45:67:89:AB Discovering: yes
+[NEW] Device 00:11:22:33:44:55 Petrel
+[bluetooth]# trust 00:11:22:33:44:55        &lt;----you can use the tab key to autocomplete the MAC address
+[CHG] Device 00:11:22:33:44:55 Trusted: yes
+Changing 00:11:22:33:44:55 trust succeeded
+[bluetooth]# pair 00:11:22:33:44:55
+Attempting to pair with 00:11:22:33:44:55
+[CHG] Device 00:11:22:33:44:55 Connected: yes
+[CHG] Device 00:11:22:33:44:55 UUIDs: 00001101-0000-1000-8000-0089abc12345
+[CHG] Device 00:11:22:33:44:55 Paired: yes
+Pairing successful
+[CHG] Device 00:11:22:33:44:55 Connected: no</code></pre>
+</div></div>
+<div class="paragraph"><p>Si se solicita una contraseña, introduce 0000. Está bien aunque la última
+línea diga <em>Connected: no</em>. La parte importante es la anterior <code>Pairing
+successful</code>.</p></div>
+<div class="paragraph"><p>Si el sistema tiene Bluez 4 (p.e. Ubuntu 12.04 a 15.04), probablemente no haya
+<code>bluetoothctl</code>, sino un script llamado <code>bluez-simple-agent</code>.</p></div>
+<div class="literalblock">
+<div class="content">
+<pre><code>hcitool -i hci0 scanning
+Scanning ...
+        00:11:22:33:44:55       Petrel
+        bluez-simple-agent hci0 00:11:22:33:44:55</code></pre>
+</div></div>
+<div class="paragraph"><p>Una vez que el ordenador esté emparejado, configura la conexión RFCOMM.</p></div>
+</div>
+<div class="sect4">
+<h5 id="_establecer_la_conexion_rfcomm">Establecer la conexión RFCOMM</h5>
+<div class="paragraph"><p>El comando para establecer una conexión RFCOMM es:</p></div>
+<div class="paragraph"><p><code>sudo rfcomm -i &lt;controller&gt; connect &lt;dev&gt; &lt;bdaddr&gt; [channel]</code></p></div>
 <div class="ulist"><ul>
 <li>
 <p>
-<code>sudo rfcomm bind /dev/rfcomm0 10:00:E8:C4:BE:C4</code> enlaza el ordenador de buceo
-   a un dispositivo de comunicaciones de tu PC, en caso de que rfcomm ya esté en
-   uso, simplemente usa rfcomm1 o 2 … IMPORTANT: copia/pega la dirección MAC de la
-   salida de hcitool scanning, la de aquí solo es un ejemplo.
+<code>&lt;controller&gt;</code> es el controlador Bluetooth, <code>hci0</code>.
+</p>
+</li>
+<li>
+<p>
+<code>&lt;dev&gt;</code> es el dispositivo RFCOMM, <code>rfcomm0</code>
+</p>
+</li>
+<li>
+<p>
+<code>&lt;bdaddr&gt;</code> es la dirección MAC del ordenador de buceo, +00:11:22:33:44:55
+</p>
+</li>
+<li>
+<p>
+<code>[channel]</code> es el canal Bluetooth al que nos queremos conectar.
 </p>
 </li>
 </ul></div>
-<div class="paragraph"><p>Para descargar ahora en <em>Subsurface</em> tendrás que especificar el nombre de
-dispositivo conectado a la dirección MAC, en el ejemplo anterior <em>/dev/rfcomm0</em>,
-como nombre de dispositivo a utilizar.</p></div>
+<div class="paragraph"><p>Si se omite el canal, se asume el 1. Basándonos en un número limitado de
+informaciones de usuarios el canal apropiado para el ordenador de buceo,
+probablemente sea:</p></div>
+<div class="ulist"><ul>
+<li>
+<p>
+<em>Shearwater Petrel 2</em>: channel 5
+</p>
+</li>
+<li>
+<p>
+<em>Shearwater Petrel 1</em>: channel 1
+</p>
+</li>
+<li>
+<p>
+<em>Heinrichs-Weikamp OSTC Sport</em>: channel 1
+</p>
+</li>
+</ul></div>
+<div class="paragraph"><p>P.e. para conectar un <em>Shearwater Petrel 2</em>, ajusta el ordenador de buceo a
+modo "upload" e introduce:</p></div>
+<div class="literalblock">
+<div class="content">
+<pre><code>sudo rfcomm -i hci0 connect rfcomm0 00:11:22:33:44:55 5</code></pre>
+</div></div>
+<div class="paragraph"><p>(introduce una contraseña, probablemente 0000, cuando se solicite)
+Se obtendrá la respuesta:</p></div>
+<div class="literalblock">
+<div class="content">
+<pre><code>Connected /dev/rfcomm0 to 00:11:22:33:44:55 on channel 5
+Press CTRL-C for hangup</code></pre>
+</div></div>
+<div class="paragraph"><p>Para conectar un <code>Shearwater Petrel 1</code> o <code>H&amp;W OSTC Sport</code>, ajusta el ordenador
+de buceo a modo "upload" e introduce:</p></div>
+<div class="literalblock">
+<div class="content">
+<pre><code>sudo rfcomm -i hci0 connect rfcomm0 00:11:22:33:44:55   (intruduce el password, probablemente 0000, cuando se solicite)
+Connected /dev/rfcomm0 to 00:11:22:33:44:55 on channel 1
+Press CTRL-C for hangup</code></pre>
+</div></div>
+<div class="paragraph"><p>Si se desconoce el canal específico de un ordenador de buceo, o el canal de la
+lista anterior no funciona, el comando <code>sdptool records</code> debería ayudar a dar
+con el canal apropiado, la salida a continuación es para un Petrel 2:</p></div>
+<div class="literalblock">
+<div class="content">
+<pre><code>sdptool -i hci0 records 00:11:22:33:44:55
+Service Name: Serial Port
+Service RecHandle: 0x10000
+Service Class ID List:
+        "Serial Port" (0x1101)
+        Protocol Descriptor List:
+        "L2CAP" (0x0100)
+        "RFCOMM" (0x0003)
+        Channel: 5</code></pre>
+</div></div>
+<div class="paragraph"><p>En el caso de ordenadores de buceo Bluetooth que no estén incluidos en la lista
+anterior, por favor, informa a los desarrolladores de Subsurface a través del
+foro de usuarios o de la lista de correo <em>subsurface@subsurface-divelog.org</em>.</p></div>
+</div>
+<div class="sect4">
+<h5 id="_descargar_las_inmersiones_con_subsurface">Descargar las inmersiones con Subsurface</h5>
+<div class="paragraph"><p>Tras establecer la conexión RFCOMM y mientras esta corriendo la cuenta atrás
+del ordenador de buceo, ves a <em>Subsurface</em>, selecciona desde el menú principal
+<em>Importar &#8594; Importar del ordenador de buceo</em> y selecciona el fabricante
+adecuado (p.e. <em>Shearwater</em>), el ordenador de buceo (p.e. <em>Petrel</em>), el punto
+de montaje o dispositivo (p.e. <em>/dev/rfcomm0</em>) y pulsa <em>Descargar</em>.</p></div>
+</div>
+</div>
 </div>
 </div>
 </div>
@@ -5014,7 +5748,10 @@ especificar un nombre de dispositivo desde la consola así:</td>
 descargará la información de buceo.</p></div>
 <div class="paragraph"><p>En Windows existe una situación similar. Hay drivers para el MCS7780 disponibles
 en algunos sitios de internet p.e.
-<a href="http://www.drivers-download.com/Drv/MosChip/MCS7780/">www.drivers-download.com</a>.</p></div>
+<a href="http://www.drivers-download.com/Drv/MosChip/MCS7780/">www.drivers-download.com</a>.
+También se pueden encontrar drivers IrDA basados en Windows, para los
+ordenadores Uwatec en el sitio web de ScubaPro, pudiendo encontrarlos en la
+página de descargas del software SmarTrak.</p></div>
 <div class="paragraph"><p>Para el Mac de Apple, la comunicación IrDA vía MCS7780 no está disponible para
 OSX 10.6 o superior.</p></div>
 </div>
@@ -5055,38 +5792,16 @@ mostraría el xDEEP BLACK.</td>
 </div>
 </div>
 <div class="sect2">
-<h3 id="_importar_del_shearwater_predator_usando_bluetooth">17.5. Importar del Shearwater Predator usando Bluetooth</h3>
+<h3 id="_importar_del_shearwater_predator_petrel_usando_bluetooth">17.5. Importar del Shearwater Predator/Petrel usando Bluetooth</h3>
 <div class="admonitionblock">
 <table><tr>
 <td class="icon">
 <img src="images/icons/predator.jpg" alt="Note" />
 </td>
-<td class="content">Al usar un Shearwater Predator, es posible que se pueda emparejar por bluetooth
-y, entonces, aparezcan problemas al descargar con errores como <em>Slip RX: unexp.
-SLIP END</em> en el Predator. Esto también se ha observado en otros sistemas
-operativos distintos de Linux y utilizando otro sofware de buceo. No tenemos
-idea del origen del problema o como solucionarlo, pero se ha informado que, en
-ocasiones, se puede resolver siguiendo estos pasos:</td>
+<td class="content">En la sección anterior, <a href="#S_Bluetooth"><em>Conectar Subsurface a ordenadores de buceo con Bluetooth</em></a>
+se facilitan instrucciones específicas para descargar inmersiones usando Bluetooth.</td>
 </tr></table>
 </div>
-<div class="ulist"><ul>
-<li>
-<p>
-Utilizar el receptor bluetooth que viene con el Shearwater Predator en lugar
-   del incorporado en el PC.
-</p>
-</li>
-<li>
-<p>
-Cambiar a drivers bluetooth distintos para hardware del PC
-</p>
-</li>
-<li>
-<p>
-Apagar Wi-Fi mientras se utiliza bluetooth
-</p>
-</li>
-</ul></div>
 </div>
 <div class="sect2">
 <h3 id="S_PoseidonMkVI">17.6. Importar desde el Poseidon MKVI Discovery</h3>
@@ -5144,6 +5859,11 @@ como sigue:</td>
 <div class="ulist"><ul>
 <li>
 <p>
+Descargar la inmersión usando <em>AP Communicator</em>.
+</p>
+</li>
+<li>
+<p>
 Abrir una inmersión con el <em>AP Log Viewer</em>.
 </p>
 </li>
@@ -5154,7 +5874,7 @@ Seleccionar la pestaña llamada <em>Datos</em> (<em>Data</em>).
 </li>
 <li>
 <p>
-Si se muestran en la pantalla los datos del diario "en crudo", pulsar en
+Con los datos del diario "en crudo" mostrados en pantalla, pulsar en
   <em>Copiar al portapapeles</em>.
 </p>
 </li>
@@ -5166,7 +5886,7 @@ Abrir un editor de texto (p.e. Notepad en windows o TextWrangler en Mac).
 <li>
 <p>
 Copiar el contenido del portapapeles al editor y guardar el archivo de texto
-  con extensión de archivo .csv.
+  con extensión de archivo <em>.apd</em>
 </p>
 </li>
 <li>
@@ -5177,29 +5897,42 @@ Desde Subsurface, seleccionar <em>Importar &#8594; Importar archivos de registro
 </li>
 <li>
 <p>
-En la lista desplegable de abajo del diálogo seleccionar <em>Archivos CSV</em>.
+En la lista desplegable de abajo del diálogo (llamada <em>Filtro:</em>) seleccionar "APD log viewer".
 </p>
 </li>
 <li>
 <p>
-En la lista de nombres de archivo, seleccionar el archivo .CSV que acabamos
-  de crear y se abrirá un diálogo de importación.
-</p>
-</li>
-<li>
-<p>
-En la lista desplegable llamada <em>Importaciones pre-configuradas</em>, seleccionar
-  el <em>APD Log Viewer</em>.
-</p>
-</li>
-<li>
-<p>
-Asegurarse que los otros ajustes del diario APD son correctas y pulsar
-  <em>Aceptar</em>.
+En la lista de nombres de archivo, seleccionar el archivo <em>.apd</em> que acabamos
+  de crear y se abrirá un diálogo de importación que mostrará los ajustes por
+  defecto para los datos en un archivo <em>.apd</em>. Si es necesario algún cambio
+  hazlo como en <a href="#S_ImportingCSVDives">CSV imports</a>.
 </p>
 </li>
 </ul></div>
-<div class="paragraph"><p>El diario de APD aparecerá en <em>Subsurface</em>.</p></div>
+<div class="imageblock" style="text-align:center;">
+<div class="content">
+<img src="images/APD_CSVimportF22.jpg" alt="Figure: APD log viewer import" />
+</div>
+</div>
+<div class="ulist"><ul>
+<li>
+<p>
+El primer desplegable a la izquierda en el panel de importación nos permite
+el ordenador de buceo APD del que importar el registro. Por defecto es DC1, el
+primero de los dos ordenadores que usa el APD. Es posible importar secuencialmente
+los datos de ambos ordenadores, importando primero el DC1 y luego el DC2.
+(<strong>Truco</strong>: Los registros de ambos ordenadores se pueden visualizar seleccionando
+ <em>Vista &#8594; Siguiente Ordenador</em> desde el menú principal, o situando el cursor
+ sobre el perfil y pulsando la flecha derecha/izquierda). Pulsa el botón OK en
+la parte de debajo del panel.
+</p>
+</li>
+</ul></div>
+<div class="paragraph"><p>El diario de APD aparecerá en <em>Subsurface</em>. El techo generado por el ordenador
+Inspiration puede visualizarse seleccionando el correspondiente botón de la
+izquierda del <strong>Perfil de inmersión</strong>. Los datos de presión de las botellas no
+se registran en el equipo APD pero pueden completarse a mano desde la pestaña
+<strong>Equipo</strong>.</p></div>
 </div>
 </div>
 </div>
@@ -5463,38 +6196,51 @@ La password para acceder al archivo .zip es <em>mares</em>.
 </ol></div>
 </div>
 <div class="sect2">
-<h3 id="S_ImportingDivingLog">18.4. Exportar desde <strong>DivingLog 5.0</strong></h3>
+<h3 id="S_ImportingDivingLog">18.4. Exportar desde <strong>DivingLog 5.0 y 6.0</strong></h3>
 <div class="admonitionblock">
 <table><tr>
 <td class="icon">
 <img src="images/icons/divingloglogo.jpg" alt="Note" />
 </td>
-<td class="content">Desafortunadamente los archivos XML de DivingLog no proporcionan indicación
-alguna de las preferencias marcadas en nuestro sistema. Por tanto, para que
-<em>Subsurface</em> pueda importar con exito archivos de DivingLog, se necesita primero
-asegurarse de que DivingLog está configurado para usar el sistema métrico (esto
-se puede modificar fácilmente desde DivingLog seleccionando <em>Archivo →
-Preferencias → Unidades y Lenguaje</em> y haciendo clic en el botón <em>Métrico</em>. Luego
-se hace lo siguiente:</td>
+<td class="content">La mejor manera de traer tus diarios desde DivingLog a <em>Subsurface</em> es
+convertir la base de datos completa. Esto se debe a que otros formatos de
+exportación no incluyen todos los detalles, y careceríamos, por ejemplo, de
+cambios de gas e información acerca de que unidades se utilizan. Al importar
+la base de datos, toda esta información esta incluida y disponible.</td>
 </tr></table>
 </div>
+<div class="paragraph"><p>Para transferir todos los archivos desde DivingLog a <em>Subsurface</em> haz lo
+siguiente:</p></div>
 <div class="olist arabic"><ol class="arabic">
 <li>
 <p>
-En DivingLog, abrir el menú <em>Archivo → Export → XML</em>
+En DivingLog abre el menú <em>Archivo &#8594;  Exportar &#8594;  SQLite</em>
 </p>
 </li>
 <li>
 <p>
-Seleccionar las inmersiones a exportar
+Selecciona el botón <em>Ajustes</em>
 </p>
 </li>
 <li>
 <p>
-Hacer clic en el botón de exportar y seleccionar un nombre de archivo.
+Ajusta el <em>RTF2Plaintext</em> a <em>true</em>
+</p>
+</li>
+<li>
+<p>
+Cierra el diálogo <em>Ajustes</em>
+</p>
+</li>
+<li>
+<p>
+Pulsa el botón <em>Exportar</em> y selecciona el nombre de archivo
 </p>
 </li>
 </ol></div>
+<div class="paragraph"><p>Una vez hecho esto, abre con <em>Subsurface_la base de datos guardada y las
+inmersiones se convertirán automáticamente a nuestro formato. El último paso
+a efectuar es guardar el diario en _Subsurface</em>.</p></div>
 </div>
 </div>
 </div>
@@ -5657,10 +6403,347 @@ un editor de textos y luego importar los datos de buceo como se explicó en
 </div>
 </div>
 <div class="sect1">
-<h2 id="_apendice_e_preguntas_frecuentes">20. APENDICE E: Preguntas Frecuentes.</h2>
+<h2 id="S_APPENDIX_E">20. APÉNDICE E: Escribir una plantilla de impresión a medida</h2>
+<div class="sectionbody">
+<div class="paragraph"><p><em>Subsurface</em> proporciona un mecanismo para crear o modificar plantillas que
+permite producir impresiones a medida de los divelogs.  Las plantillas escritas
+en HTML, y también como sencillo conjunto de instrucciones de Grantlee, se
+interpretan y envian a la impresora por <em>Subsurface</em>.</p></div>
+<div class="paragraph"><p>Se accede a las plantillas utilizando el diálogo de impresión (imagen <strong>B</strong> a
+continuación)</p></div>
+<div class="imageblock" style="text-align:center;">
+<div class="content">
+<img src="images/Print1_f22.jpg" alt="FIGURA: Diálogo de impresión" />
+</div>
+</div>
+<div class="paragraph"><p>Los botones en la parte de abajo de diálogo permiten <em>Editar</em>, <em>Borrar</em>,
+<em>Importar</em> y <em>Exportar</em> plantillas (ver imagen <strong>A</strong> anterior). Las plantillas,
+nuevas o modificadas, se guardan como archivos HTML en la misma carpeta en la
+que está el divelog que se está procesando. Para crear o modificar una plantilla,
+selecciona la plantilla <em>Custom</em> de la lista desplegable (imagen <strong>B</strong> anterior) y
+pulsa <em>Editar</em>.</p></div>
+<div class="paragraph"><p>El panel de edición incluye tres pestañas:</p></div>
+<div class="imageblock" style="text-align:center;">
+<div class="content">
+<img src="images/Template1_f22.jpg" alt="FIGURA: Diálogo de edición de plantillas" />
+</div>
+</div>
+<div class="paragraph"><p>1) La pestaña <em>Estilo</em> (imagen <strong>A</strong> anterior) controla la fuente, el espaciado de
+   lineas y la plantilla de colores utilizada para imprimir. Los atributos de estilo
+   son editables. Elige una de las cuatro paletas.</p></div>
+<div class="paragraph"><p>2) La pestaña <em>Colores</em> (imagen <strong>B</strong> anterior) permite editar los colores que se
+   usarán para imprimir el registro. Los colores se pueden modificar: el botón
+   <em>Editar</em> de la pestaña <em>Colores</em> permite elegir colores arbitrarios para los
+   diferentes componentes de la impresión.</p></div>
+<div class="paragraph"><p>3) La pestaña <em>Plantilla</em> del panel de edición (imagen a continuación) permite crear
+   una plantilla usando HTML y sentencias de Grantlee. Grantlee proporciona la
+   habilidad de crear y formatear código HTML de forma muy simple pero muy eficiente
+   (ver a continuación). El HTML de la plantilla puede editarse y guardarse. La
+   plantilla salvada se guarda en la carpeta en la que está el divelog con el que
+   se está trabajando. Por defecto, una plantilla <em>a medida</em> es un esqueleto sin
+   instrucciones de impresión. La información a imprimir necesita ser especificada
+   y formateada reemplazando la sección "&lt;!-- Template must be filled -&#8594;".
+   Escribir código HtMl con Grantlee da una libertad ilimitada para elegir lo que
+   se imprime y como se va a visualizar.</p></div>
+<div class="imageblock" style="text-align:center;">
+<div class="content">
+<img src="images/Template2_f22.jpg" alt="FIGURE:Template tab" />
+</div>
+</div>
+<div class="paragraph"><p>El usuario también puede adaptar las plantillas existentes y guardarlas en la
+carpeta donde se halle el divelog (por ejemplo One Dive, Six Dives, Table, etc).</p></div>
+<div class="paragraph"><p>Para escribir una plantilla a medida, deben existir los siguientes elementos
+para que puedan ser manejadas e interpretadas:</p></div>
+<div class="sect2">
+<h3 id="_bucle_principal">20.1. Bucle principal</h3>
+<div class="paragraph"><p><em>Subsurface</em> pasa una lista de inmersiones llamada (<strong>dives</strong>) al sistema <em>Grantlee</em>.
+Se puede iterar sobre la lista de la siguiente manera:</p></div>
+<div class="literalblock">
+<div class="title">template.html</div>
+<div class="content">
+<pre><code>       {% for dive in dives %}
+               &lt;h1&gt; {{ dive.number }} &lt;/h1&gt;
+       {% endfor %}</code></pre>
+</div></div>
+<div class="literalblock">
+<div class="title">output.html</div>
+<div class="content">
+<pre><code>       &lt;h1&gt; 1 &lt;/h1&gt;
+       &lt;h1&gt; 2 &lt;/h1&gt;
+       &lt;h1&gt; 3 &lt;/h1&gt;</code></pre>
+</div></div>
+<div class="paragraph"><p>Se puede encontrar información sobre <em>Grantlee</em> <a href="http://www.grantlee.org/apidox/for_themers.html">aquí</a></p></div>
+</div>
+<div class="sect2">
+<h3 id="_variables_pasadas_a_grantlee">20.2. Variables pasadas a Grantlee</h3>
+<div class="paragraph"><p>Solo se pasa un subconjunto de los datos de una inmersión:</p></div>
+<div class="tableblock">
+<table rules="all"
+width="100%"
+frame="border"
+cellspacing="0" cellpadding="4">
+<col width="50%" />
+<col width="50%" />
+<tbody>
+<tr>
+<td align="left" valign="top"><p class="table"><strong>Nombre</strong></p></td>
+<td align="left" valign="top"><p class="table"><strong>Descripción</strong></p></td>
+</tr>
+<tr>
+<td align="left" valign="top"><p class="table">number</p></td>
+<td align="left" valign="top"><p class="table">(<strong>int</strong>) número de la inmersión</p></td>
+</tr>
+<tr>
+<td align="left" valign="top"><p class="table">id</p></td>
+<td align="left" valign="top"><p class="table">(<strong>int</strong>) diveID único, se usará para descargar el perfil</p></td>
+</tr>
+<tr>
+<td align="left" valign="top"><p class="table">date</p></td>
+<td align="left" valign="top"><p class="table">(<strong>string</strong>) fecha de la inmersión</p></td>
+</tr>
+<tr>
+<td align="left" valign="top"><p class="table">time</p></td>
+<td align="left" valign="top"><p class="table">(<strong>string</strong>) hora de la inmersión</p></td>
+</tr>
+<tr>
+<td align="left" valign="top"><p class="table">location</p></td>
+<td align="left" valign="top"><p class="table">(<strong>string</strong>) ubicación del buceo</p></td>
+</tr>
+<tr>
+<td align="left" valign="top"><p class="table">duration</p></td>
+<td align="left" valign="top"><p class="table">(<strong>string</strong>) duración del buceo</p></td>
+</tr>
+<tr>
+<td align="left" valign="top"><p class="table">depth</p></td>
+<td align="left" valign="top"><p class="table">(<strong>string</strong>) profundidad de la inmersión</p></td>
+</tr>
+<tr>
+<td align="left" valign="top"><p class="table">divemaster</p></td>
+<td align="left" valign="top"><p class="table">(<strong>string</strong>) datos del divemaster</p></td>
+</tr>
+<tr>
+<td align="left" valign="top"><p class="table">buddy</p></td>
+<td align="left" valign="top"><p class="table">(<strong>string</strong>) datos del compañero</p></td>
+</tr>
+<tr>
+<td align="left" valign="top"><p class="table">airTemp</p></td>
+<td align="left" valign="top"><p class="table">(<strong>string</strong>) temperatura del aire</p></td>
+</tr>
+<tr>
+<td align="left" valign="top"><p class="table">waterTemp</p></td>
+<td align="left" valign="top"><p class="table">(<strong>string</strong>) temperatura del agua</p></td>
+</tr>
+<tr>
+<td align="left" valign="top"><p class="table">notes</p></td>
+<td align="left" valign="top"><p class="table">(<strong>string</strong>) notas de la inmersión</p></td>
+</tr>
+<tr>
+<td align="left" valign="top"><p class="table">rating</p></td>
+<td align="left" valign="top"><p class="table">(<strong>int</strong>) calificación del buceo, varía entre 0 y 5</p></td>
+</tr>
+<tr>
+<td align="left" valign="top"><p class="table">sac</p></td>
+<td align="left" valign="top"><p class="table">(<strong>string</strong>) valor del CAS</p></td>
+</tr>
+<tr>
+<td align="left" valign="top"><p class="table">tags</p></td>
+<td align="left" valign="top"><p class="table">(<strong>string</strong>) todas las etiquetas de la inmersión empalmadas</p></td>
+</tr>
+<tr>
+<td align="left" valign="top"><p class="table">gas</p></td>
+<td align="left" valign="top"><p class="table">(<strong>string</strong>) datos de la botella</p></td>
+</tr>
+</tbody>
+</table>
+</div>
+<div class="paragraph"><p><em>Subsurface</em> también pasa datos de la plantilla <strong>template_options</strong>. Estos datos
+deben usarse como valores <em>CSS</em> para proporcionar una plantilla editable de
+forma dinámica. Los datos exportados se muestran en la tabla a continuación:</p></div>
+<div class="tableblock">
+<table rules="all"
+width="100%"
+frame="border"
+cellspacing="0" cellpadding="4">
+<col width="50%" />
+<col width="50%" />
+<tbody>
+<tr>
+<td align="left" valign="top"><p class="table"><strong>Nombre</strong></p></td>
+<td align="left" valign="top"><p class="table"><strong>Descripción</strong></p></td>
+</tr>
+<tr>
+<td align="left" valign="top"><p class="table">font</p></td>
+<td align="left" valign="top"><p class="table">(<strong>string</strong>) familia de la fuente</p></td>
+</tr>
+<tr>
+<td align="left" valign="top"><p class="table">borderwidth</p></td>
+<td align="left" valign="top"><p class="table">(<strong>int</strong>) valor de la anchura del borde, calculado dinámicamente
+como 0.1% de la anchura de la página con un valor mínimo de 1px</p></td>
+</tr>
+<tr>
+<td align="left" valign="top"><p class="table">font_size</p></td>
+<td align="left" valign="top"><p class="table">(<strong>double</strong>) tamaño de la fuente en vw, varía entre 1.0 y 2.0</p></td>
+</tr>
+<tr>
+<td align="left" valign="top"><p class="table">line_spacing</p></td>
+<td align="left" valign="top"><p class="table">(<strong>double</strong>) distancia entre líneas de texto, varía entre 1.0 y 3.0</p></td>
+</tr>
+<tr>
+<td align="left" valign="top"><p class="table">color1</p></td>
+<td align="left" valign="top"><p class="table">(<strong>string</strong>) color del fondo</p></td>
+</tr>
+<tr>
+<td align="left" valign="top"><p class="table">color2</p></td>
+<td align="left" valign="top"><p class="table">(<strong>string</strong>) color primario de las celdas de la tabla</p></td>
+</tr>
+<tr>
+<td align="left" valign="top"><p class="table">color3</p></td>
+<td align="left" valign="top"><p class="table">(<strong>string</strong>) color secundario de las celdas de la tabla</p></td>
+</tr>
+<tr>
+<td align="left" valign="top"><p class="table">color4</p></td>
+<td align="left" valign="top"><p class="table">(<strong>string</strong>) color primario del texto</p></td>
+</tr>
+<tr>
+<td align="left" valign="top"><p class="table">color5</p></td>
+<td align="left" valign="top"><p class="table">(<strong>string</strong>) color secundario del texto</p></td>
+</tr>
+<tr>
+<td align="left" valign="top"><p class="table">color6</p></td>
+<td align="left" valign="top"><p class="table">(<strong>string</strong>) colores de los bordes</p></td>
+</tr>
+</tbody>
+</table>
+</div>
+<div class="literalblock">
+<div class="title">template.html</div>
+<div class="content">
+<pre><code>       border-width: {{ template_options.borderwidth }}px;</code></pre>
+</div></div>
+<div class="literalblock">
+<div class="title">output.html</div>
+<div class="content">
+<pre><code>       border-width: 3px;</code></pre>
+</div></div>
+<div class="paragraph"><p>Otra variable que pasa <em>Subsurface</em> es <strong>print_options</strong>. Esta variable solo
+contiene un único valor:</p></div>
+<div class="tableblock">
+<table rules="all"
+width="100%"
+frame="border"
+cellspacing="0" cellpadding="4">
+<col width="50%" />
+<col width="50%" />
+<tbody>
+<tr>
+<td align="left" valign="top"><p class="table"><strong>Nombre</strong></p></td>
+<td align="left" valign="top"><p class="table"><strong>Descripción</strong></p></td>
+</tr>
+<tr>
+<td align="left" valign="top"><p class="table">grayscale</p></td>
+<td align="left" valign="top"><p class="table">Utiliza filtros <em>CSS</em> para convertir la página a escala de grises
+(debe añadirse al estilo del cuerpo para activar la impresión en blanco y negro)</p></td>
+</tr>
+</tbody>
+</table>
+</div>
+<div class="literalblock">
+<div class="title">template.html</div>
+<div class="content">
+<pre><code>       body {
+               {{ print_options.grayscale }};
+       }</code></pre>
+</div></div>
+<div class="literalblock">
+<div class="title">output.html</div>
+<div class="content">
+<pre><code>       body {
+               -webkit-filter: grayscale(100%);
+       }</code></pre>
+</div></div>
+</div>
+<div class="sect2">
+<h3 id="_selectores_css_definidos">20.3. Selectores CSS definidos</h3>
+<div class="paragraph"><p>Como el perfil se coloca después del renderizado, <em>Subsurface</em> usa unos selectores
+<em>CSS</em> especiales para ejecutar algunas búsquedas en la salida HTML. Deben añadirse
+los selectores de la siguiente tabla:</p></div>
+<div class="tableblock">
+<table rules="all"
+width="100%"
+frame="border"
+cellspacing="0" cellpadding="4">
+<col width="33%" />
+<col width="33%" />
+<col width="33%" />
+<tbody>
+<tr>
+<td align="left" valign="top"><p class="table"><strong>Selector</strong></p></td>
+<td align="left" valign="top"><p class="table"><strong>Tipo</strong></p></td>
+<td align="left" valign="top"><p class="table"><strong>Descripción</strong></p></td>
+</tr>
+<tr>
+<td align="left" valign="top"><p class="table">dive_{{ dive.id }}</p></td>
+<td align="left" valign="top"><p class="table">id</p></td>
+<td align="left" valign="top"><p class="table">se utiliza para descargar el perfil de inmersión
+correspondiente</p></td>
+</tr>
+<tr>
+<td align="left" valign="top"><p class="table">diveProfile</p></td>
+<td align="left" valign="top"><p class="table">class</p></td>
+<td align="left" valign="top"><p class="table">cada div que contendrá un perfil de inmersión debe tener
+este selector de clase añadido al selector divee_{{ dive.id }}</p></td>
+</tr>
+<tr>
+<td align="left" valign="top"><p class="table">dontbreak</p></td>
+<td align="left" valign="top"><p class="table">class</p></td>
+<td align="left" valign="top"><p class="table">evita que el div que tenga esta clase se divida en dos
+páginas</p></td>
+</tr>
+</tbody>
+</table>
+</div>
+<div class="paragraph"><p>IMPORTANTE: Renderizar perfiles de inmersión no está soportado en plantillas
+de distribución de flujo (cuando datos-número de buceos = 0).</p></div>
+</div>
+<div class="sect2">
+<h3 id="_atributos_especiales">20.4. Atributos especiales</h3>
+<div class="paragraph"><p>Hay dos formas de renderizar: bien renderizar un número concreto de buceos por
+página, bien hacer que <em>Subsurface</em> intente introducir tantas inmersiones como
+sea posible en una sola página.</p></div>
+<div class="paragraph"><p>El atributo de datos <strong>data-numberofdives</strong> se añade a la etiqueta body para
+fijar el modo de renderizado.</p></div>
+<div class="ulist"><ul>
+<li>
+<p>
+Renderizar 6 inmersiones por página:
+</p>
+</li>
+</ul></div>
+<div class="literalblock">
+<div class="content">
+<pre><code>       &lt;body data-numberofdives = 6&gt;</code></pre>
+</div></div>
+<div class="ulist"><ul>
+<li>
+<p>
+Renderizar tantas inmersiones como sea posible:
+</p>
+</li>
+</ul></div>
+<div class="literalblock">
+<div class="content">
+<pre><code>       &lt;body data-numberofdives = 0&gt;</code></pre>
+</div></div>
+<div class="paragraph"><p>IMPORTANTE: Todas las unidades CSS deben estar en longitudes relativas para
+imprimir en cualquier tamaño de página.</p></div>
+</div>
+</div>
+</div>
+<div class="sect1">
+<h2 id="S_APPENDIX_F">21. APÉNDICE F: Preguntas Frecuentes</h2>
 <div class="sectionbody">
 <div class="sect2">
-<h3 id="_em_subsurface_em_parece_calcular_mal_el_consumo_de_gas_y_el_cas">20.1. <em>Subsurface</em> parece calcular mal el consumo de gas y el CAS</h3>
+<h3 id="_em_subsurface_em_parece_calcular_mal_el_consumo_de_gas_y_el_cas">21.1. <em>Subsurface</em> parece calcular mal el consumo de gas y el CAS</h3>
 <div class="paragraph" id="SAC_CALCULATION"><p><em>Pregunta</em>: Buceé con una botella de 12,2 l empezando con 220 bar y terminando
 con 100 bar y yo calculo un CAS distinto al que calcula <em>Subsurface</em> ¿Está
 calculándolo mal <em>Subsurface</em>?</p></div>
@@ -5692,7 +6775,7 @@ altas presiones. A 400 bar realmente no contiene el doble de aire que a 200 bar.
 A presiones más bajas, el aire se comporta bastante como un gas ideal.</p></div>
 </div>
 <div class="sect2">
-<h3 id="_algunos_perfiles_de_inmersion_tienen_discrepancias_de_tiempos_con_las_muestras_que_toma_mi_ordenador_de_buceo">20.2. Algunos perfiles de inmersión tienen discrepancias de tiempos con las muestras que toma mi ordenador de buceo …</h3>
+<h3 id="_algunos_perfiles_de_inmersion_tienen_discrepancias_de_tiempos_con_las_muestras_que_toma_mi_ordenador_de_buceo">21.2. Algunos perfiles de inmersión tienen discrepancias de tiempos con las muestras que toma mi ordenador de buceo …</h3>
 <div class="paragraph"><p><em>Subsurface</em> termina por ignorar el tiempo en superficie por varios motivos
 (profundidad media, tiempo de inmersión, CAS, etc).</p></div>
 <div class="paragraph"><p><em>Pregunta</em>: ¿Por qué las duraciones de los buceos en mi ordenador difieren de
@@ -5706,13 +6789,31 @@ como actuar de instructor en inmersiones de curso, donde puedes estar en el agua
 mucho rato pero pasar la mayor parte del tiempo en superficie. En este caso no
 querrás que te cuente como algún tipo de inmersión larga.</p></div>
 </div>
+<div class="sect2">
+<h3 id="_se_han_perdido_algunos_perfiles_en_la_descarga">21.3. Se han perdido algunos perfiles en la descarga</h3>
+<div class="paragraph" id="DC_HISTORY"><p><em>Pregunta</em>: No consigo descargar todas mis inmersiones, solo las más recientes,
+incluso aunque el manual de mi ordenador de buceo afirma que guarda el historial
+de, por ejemplo, 999 buceos.</p></div>
+<div class="paragraph"><p><em>Respuesta</em>: El historial de buceo es diferente de los perfiles de inmersión del
+registro. El historial solo conserva rastro del total de inmersiones y el tiempo
+total pasado bajo el agua. Los registros, por otra parte, conservan el perfil de
+inmersión, pero disponen de una cantidad limitada de memoria para hacerlo. La
+cantidad exacta de perfiles que pueden guardarse en un dispositivo dependen del
+intervalo de las muestras y de la duración de los buceos. Una vez que la memoria
+se ha llenado se sobre escriben las inmersiones más antiguas con nuevas. De
+esta forma, solo podemos descargar las últimas 13, 30 o 199 inmersiones.</p></div>
+<div class="paragraph"><p>Si has descargado tus inmersiones a otro divelog antes de que se sobrescribieran,
+hay muchas posibilidades de que Subsurface pueda importarlas. Sin embargo, si los
+registros estaban solo en el ordenador de buceo, no pueden recuperarse tras haber
+sido sobrescritos.</p></div>
+</div>
 </div>
 </div>
 </div>
 <div id="footnotes"><hr /></div>
 <div id="footer">
 <div id="footer-text">
-Last updated 2015-02-17 08:49:01 PST
+Last updated 2015-10-04 19:03:44 IST
 </div>
 </div>
 </body>
diff --git a/Documentation/user-manual_fr.html.git b/Documentation/user-manual_fr.html.git
index ac9c1b39e..4ce00200e 100644
--- a/Documentation/user-manual_fr.html.git
+++ b/Documentation/user-manual_fr.html.git
@@ -3,7 +3,7 @@
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">
 <head>
 <meta http-equiv="Content-Type" content="application/xhtml+xml; charset=UTF-8" />
-<meta name="generator" content="AsciiDoc 8.6.8" />
+<meta name="generator" content="AsciiDoc 8.6.9" />
 <title></title>
 <style type="text/css">
 /*
@@ -383,440 +383,440 @@ install: function(toclevels) {
 
   function reinstallAndRemoveTimer() {
     clearInterval(timerId);
-    reinstall();
-  }
-
-  timerId = setInterval(reinstall, 500);
-  if (document.addEventListener)
-    document.addEventListener("DOMContentLoaded", reinstallAndRemoveTimer, false);
-  else
-    window.onload = reinstallAndRemoveTimer;
-}
-
-}
-asciidoc.install(3);
-/*]]>*/
-</script>
-</head>
-<body class="article">
-<div id="header">
-</div>
-<div id="content">
-<div class="imageblock" style="text-align:center;">
-<div class="content">
-<img src="images/Subsurface4Banner.jpg" alt="Banner" />
-</div>
-</div>
-<div class="paragraph"><p><span class="big">MANUEL UTILISATEUR</span></p></div>
-<div class="paragraph"><p><strong>Auteurs du manuel</strong> : Willem Ferguson, Jacco van Koll, Dirk Hohndel, Reinout Hoornweg,
-Linus Torvalds, Miika Turkia, Amit Chaudhuri, Jan Schubert, Salvador Cuñat, Pedro Neves</p></div>
-<div class="paragraph"><p><span class="blue"><em>Version 4.5, Octobre 2015</em></span></p></div>
-<div class="paragraph"><p>Bienvenue en tant qu&#8217;utilisateur de <em>Subsurface</em>, un programme avancé
-d&#8217;enregistrement de plongées (carnet de plongées) avec une bonne
-infrastructure pour décrire, organiser, interpréter et imprimer des plongées
-en scaphandre et en apnée. <em>Subsurface</em> offre de nombreux avantages par
-rapport à d&#8217;autres solutions logicielles similaires :</p></div>
-<div class="ulist"><ul>
-<li>
-<p>
-Avez-vous besoin d&#8217;une façon d&#8217;enregistrer vos plongées utilisant des
-   équipements loisirs, même sans utiliser d&#8217;ordinateur de plongée ?
-</p>
-</li>
-<li>
-<p>
-Utilisez-vous deux marques différentes d&#8217;ordinateurs de plongée, chacun avec
-   son propre logiciel propriétaire pour télécharger les enregistrements des
-   plongées ? Plongez-vous avec un recycleur ou un équipement en circuit ouvert
-   ou de loisir ? Utilisez-vous un enregistreur de profondeur et de durée
-   Reefnet Sensus avec un ordinateur de plongée ? <em>Subsurface</em> offre une
-   interface standard pour télécharger les enregistrements des plongées à
-   partir de tous ces équipements de plongée et pour enregistrer et analyser
-   ces enregistrements dans un système unique.
-</p>
-</li>
-<li>
-<p>
-Utilisez-vous plus d&#8217;un système d&#8217;exploitation ? <em>Subsurface</em> est
+    reinstall();
+  }
+
+  timerId = setInterval(reinstall, 500);
+  if (document.addEventListener)
+    document.addEventListener("DOMContentLoaded", reinstallAndRemoveTimer, false);
+  else
+    window.onload = reinstallAndRemoveTimer;
+}
+
+}
+asciidoc.install(3);
+/*]]>*/
+</script>
+</head>
+<body class="article">
+<div id="header">
+</div>
+<div id="content">
+<div class="imageblock" style="text-align:center;">
+<div class="content">
+<img src="images/Subsurface4Banner.jpg" alt="Banner" />
+</div>
+</div>
+<div class="paragraph"><p><span class="big">MANUEL UTILISATEUR</span></p></div>
+<div class="paragraph"><p><strong>Auteurs du manuel</strong> : Willem Ferguson, Jacco van Koll, Dirk Hohndel, Reinout Hoornweg,
+Linus Torvalds, Miika Turkia, Amit Chaudhuri, Jan Schubert, Salvador Cuñat, Pedro Neves</p></div>
+<div class="paragraph"><p><span class="blue"><em>Version 4.5, Octobre 2015</em></span></p></div>
+<div class="paragraph"><p>Bienvenue en tant qu&#8217;utilisateur de <em>Subsurface</em>, un programme avancé
+d&#8217;enregistrement de plongées (carnet de plongées) avec une bonne
+infrastructure pour décrire, organiser, interpréter et imprimer des plongées
+en scaphandre et en apnée. <em>Subsurface</em> offre de nombreux avantages par
+rapport à d&#8217;autres solutions logicielles similaires :</p></div>
+<div class="ulist"><ul>
+<li>
+<p>
+Avez-vous besoin d&#8217;une façon d&#8217;enregistrer vos plongées utilisant des
+   équipements loisirs, même sans utiliser d&#8217;ordinateur de plongée ?
+</p>
+</li>
+<li>
+<p>
+Utilisez-vous deux marques différentes d&#8217;ordinateurs de plongée, chacun avec
+   son propre logiciel propriétaire pour télécharger les enregistrements des
+   plongées ? Plongez-vous avec un recycleur ou un équipement en circuit ouvert
+   ou de loisir ? Utilisez-vous un enregistreur de profondeur et de durée
+   Reefnet Sensus avec un ordinateur de plongée ? <em>Subsurface</em> offre une
+   interface standard pour télécharger les enregistrements des plongées à
+   partir de tous ces équipements de plongée et pour enregistrer et analyser
+   ces enregistrements dans un système unique.
+</p>
+</li>
+<li>
+<p>
+Utilisez-vous plus d&#8217;un système d&#8217;exploitation ? <em>Subsurface</em> est
    intégralement compatible avec Mac, Linux et Windows, ce qui vous permet
    d&#8217;accéder à vos enregistrements de plongées sur chaque système
    d&#8217;exploitation en utilisant une application unique.
 </p>
-</li>
-<li>
-<p>
-Utilisez-vous Linux ou Mac et votre ordinateur de plongée n&#8217;a que des
-   logiciels pour Windows pour télécharger les informations de plongées (par
-   exemple Mares) ? <em>Subsurface</em> fournit un moyen de télécharger et d&#8217;analyser
-   vos enregistrements de plongées sur d&#8217;autres systèmes d&#8217;exploitation.
-</p>
-</li>
-<li>
-<p>
-Avez-vous besoin d&#8217;un planificateur de plongée graphique intuitif qui
-   intègre et prend en compte les plongées qui ont déjà été enregistrées ?
-</p>
-</li>
-<li>
-<p>
-Avez-vous besoin d&#8217;un moyen d&#8217;enregistrer ou de sauvegarder votre carnet de
-   plongée sur Internet, Vous permettant de visualiser votre carnet depuis
-   n&#8217;importe où, en utilisant un navigateur Internet ?
-</p>
-</li>
-</ul></div>
-<div class="paragraph"><p><em>Subsurface</em> est disponible pour Windows (Win XP ou plus récent), les Macs
-basés sur processeurs Intel (OS/X) et de nombreuses distributions
-Linux. <em>Subsurface</em> peut être compilé pour bien plus de plateformes
-matérielles et d&#8217;environnements logiciels où Qt et libdivecomputer sont
-disponibles.</p></div>
-<div class="paragraph"><p>Le but de ce document est l&#8217;utilisation du programme Subsurface. Pour
-installer le logiciel, consultez la page <em>Téléchargement</em> sur le
-<a href="http://subsurface-divelog.org/">site web de <em>Subsurface</em></a>. En cas de
-problème, vous pouvez envoyer un e-mail sur
-<a href="mailto:subsurface@subsurface-divelog.org">notre liste de diffusion</a> et
-rapportez les bogues sur <a href="http://trac.hohndel.org">notre bugtracker</a>.  Pour
-des instructions de compilation du logiciel et (si besoin) de ses
-dépendances, merci de consulter le fichier INSTALL inclus dans les sources
-logicielles.</p></div>
+</li>
+<li>
+<p>
+Utilisez-vous Linux ou Mac et votre ordinateur de plongée n&#8217;a que des
+   logiciels pour Windows pour télécharger les informations de plongées (par
+   exemple Mares) ? <em>Subsurface</em> fournit un moyen de télécharger et d&#8217;analyser
+   vos enregistrements de plongées sur d&#8217;autres systèmes d&#8217;exploitation.
+</p>
+</li>
+<li>
+<p>
+Avez-vous besoin d&#8217;un planificateur de plongée graphique intuitif qui
+   intègre et prend en compte les plongées qui ont déjà été enregistrées ?
+</p>
+</li>
+<li>
+<p>
+Avez-vous besoin d&#8217;un moyen d&#8217;enregistrer ou de sauvegarder votre carnet de
+   plongée sur Internet, Vous permettant de visualiser votre carnet depuis
+   n&#8217;importe où, en utilisant un navigateur Internet ?
+</p>
+</li>
+</ul></div>
+<div class="paragraph"><p><em>Subsurface</em> est disponible pour Windows (Win XP ou plus récent), les Macs
+basés sur processeurs Intel (OS/X) et de nombreuses distributions
+Linux. <em>Subsurface</em> peut être compilé pour bien plus de plateformes
+matérielles et d&#8217;environnements logiciels où Qt et libdivecomputer sont
+disponibles.</p></div>
+<div class="paragraph"><p>Le but de ce document est l&#8217;utilisation du programme Subsurface. Pour
+installer le logiciel, consultez la page <em>Téléchargement</em> sur le
+<a href="http://subsurface-divelog.org/">site web de <em>Subsurface</em></a>. En cas de
+problème, vous pouvez envoyer un e-mail sur
+<a href="mailto:subsurface@subsurface-divelog.org">notre liste de diffusion</a> et
+rapportez les bogues sur <a href="http://trac.hohndel.org">notre bugtracker</a>.  Pour
+des instructions de compilation du logiciel et (si besoin) de ses
+dépendances, merci de consulter le fichier INSTALL inclus dans les sources
+logicielles.</p></div>
 <div class="paragraph"><p><strong>Public</strong> : Plongeurs loisirs, apnéistes, plongeurs Tek et plongeurs
 professionnels</p></div>
 <div id="toc">
-  <div id="toctitle">Table of Contents</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. Utilisation de ce manuel</h2>
-<div class="sectionbody">
-<div class="paragraph"><p>Lorsqu&#8217;il est ouvert depuis <em>Subsurface</em>, ce manuel n&#8217;a pas de contrôles
-externes. Cependant, une fonction de <em>RECHERCHE</em> est importante. Elle est
-activée par la combinaison de touches du clavier Ctrl-F ou commande-F. Un
-champ de recherche apparait en bas de la fenêtre. Il suffit de l&#8217;utiliser
-pour rechercher n&#8217;importe quel terme dans le manuel.</p></div>
-</div>
-</div>
-<div class="sect1">
-<h2 id="_le_sondage_utilisateur">2. Le sondage utilisateur</h2>
-<div class="sectionbody">
-<div class="paragraph"><p>Dans le but de développer <em>Subsurface</em> d&#8217;une manière qui serve ses
-utilisateurs de la meilleur manière qu&#8217;il soit, il est important d&#8217;avoir des
-informations sur les utilisateurs. À l&#8217;ouverture de <em>Subsurface</em> après avoir
-utilisé le logiciel pendant une semaine environ, une fenêtre de sondage
-apparait. Cela est complètement optionnel et l&#8217;utilisateur contrôle quelles
-informations sont envoyées ou non à l'équipe de développement de
-<em>Subsurface</em>. Toutes les données que l&#8217;utilisateur choisit d&#8217;envoyer sont
-extrêmement utiles et ne seront utilisées que pour les futures
-développements et modifications du logiciel pour coller au mieux aux besoins
-des utilisateurs de <em>Subsurface</em>. Si vous complétez le sondage ou cliquez
-sur l&#8217;option pour ne plus être sondé, cela devrait être la dernière
-communication de ce type que vous recevrez. Cependant, si vos habitudes de
-plongées ou d&#8217;utilisation de Subsurface changent, vous pouvez envoyer un
-nouveau sondage en démarrant <em>Subsurface</em> avec l&#8217;option  <em>--survey</em> sur la
-ligne de commande.</p></div>
-</div>
-</div>
-<div class="sect1">
-<h2 id="S_StartUsing">3. Commencer à utiliser le programme</h2>
-<div class="sectionbody">
-<div class="paragraph"><p>La fenêtre <em>Subsurface</em> est généralement divisée en 4 panneaux avec un <strong>Menu
-principal</strong> (Fichier Importer Journal Vue Aide) en haut de la fenêtre (pour
-Windows et Linux) ou en haut de l'écran (pour Mac et Ubuntu Unity). Les
-quatre panneaux sont :</p></div>
-<div class="paragraph"><p>La <strong>liste des plongées</strong> en bas à gauche, contenant une liste de toutes les
-plongées du journal (carnet) de plongées de l&#8217;utilisateur. Une plongée peut
-être sélectionnée et mise en surbrillance dans la liste en cliquant
-dessus. Dans la plupart des cas, les touches haut/bas peuvent être utilisée
-pour passer d&#8217;une plongée à l&#8217;autre. La <strong>liste des plongées</strong> est un outil
-important pour manipuler un journal (carnet) de plongée.</p></div>
-<div class="paragraph"><p>La <strong>carte de plongée</strong> en bas à droite, affiche les sites de plongées de
-l&#8217;utilisateur, sur une carte mondiale et centrée sur le site de la dernière
-plongée sélectionnée dans la <strong>liste des plongées</strong>.</p></div>
-<div class="paragraph"><p>Les <strong>informations</strong> en haut à gauche, fournissent des informations détaillées
-sur la plongée sélectionnée dans la <strong>liste des plongées</strong>, dont des
-statistiques pour la plongée sélectionnée ou pour toutes les plongées mises
-en surbrillance.</p></div>
-<div class="paragraph"><p>Le <strong>profil de plongée</strong> en haut à droite, affiche un profil de plongée
-graphique de la plongée sélectionnée dans la <strong>liste des plongées</strong>.</p></div>
-<div class="paragraph"><p>Les séparateurs entre ces panneaux peuvent être déplacés pour modifier la
-taille de chaque panneau. <em>Subsurface</em> mémorise la position de ces
-séparateurs, pour qu&#8217;au prochain lancement <em>Subsurface</em> utilise ces
-positions.</p></div>
-<div class="paragraph"><p>Si une unique plongée est sélectionnée dans la <strong>liste des plongées</strong>,
-l&#8217;emplacement de la plongée, les informations détaillées et le profil de la
-<em>plongée sélectionnée</em> sont affichées dans les panneaux respectifs. D&#8217;autre
-part, si plusieurs plongées sont sélectionnées, la dernière mise en
-surbrillance est la <em>plongée sélectionnée</em>, mais les données de <em>toutes les
-plongées mises en surbrillances</em> sont affichées dans l&#8217;onglet <strong>Stats</strong> du
-panneau <strong>informations</strong> (profondeur maximale, minimale et moyenne, les
-durées, les températures de l&#8217;eau et le SAC (air consommé); temps total et
-nombre de plongées sélectionnées).</p></div>
-<div class="imageblock" id="S_ViewPanels" style="text-align:center;">
-<div class="content">
-<img src="images/main_window_f22.jpg" alt="The Main Window" />
-</div>
-</div>
-<div class="paragraph"><p>L&#8217;utilisateur peut déterminer si lesquels des quatre panneaux sont affichés
-en sélectionnant l&#8217;option <strong>Vue</strong> dans le menu principal. Cette fonctionnalité
-permet plusieurs choix d&#8217;affichage :</p></div>
-<div class="paragraph"><p><strong>Tout</strong> : affiche les quatre panneaux tels que sur la capture d'écran ci-dessus.</p></div>
-<div class="paragraph"><p><strong>Liste des plongées</strong> : affiche uniquement la liste des plongées.</p></div>
-<div class="paragraph"><p><strong>Profil</strong> : affiche uniquement le profile de plongée de la plongée sélectionnée.</p></div>
-<div class="paragraph"><p><strong>Info</strong> : affiche uniquement les notes de plongées de la dernière plongée sélectionnée et les statistiques pour
-toutes les plongées mises en surbrillance.</p></div>
-<div class="paragraph"><p><strong>Globe</strong> : affiche uniquement la carte mondiale, centrée sur la dernière plongée sélectionnée.</p></div>
-<div class="paragraph"><p>Comme la plupart des autre fonctions qui peuvent être accédée via le menu
-principal, ces options peuvent être utilisées par des raccourcis
-clavier. Les raccourcis pour un système particulier sont affichés avec un
-souligné des les entrées de menu. À cause des différents systèmes
-d&#8217;exploitation et des divers langues, <em>Subsurface</em> peut utiliser différentes
-touches de raccourcis et ne sont donc pas détaillées ici.</p></div>
-<div class="paragraph"><p>Lorsque le programme est lancé pour la première fois, il n&#8217;affiche aucune
-information. Ceci parce que le programme n&#8217;a aucune information de plongée
-disponible. Dans les sections suivantes, le procédure pour créer a nouveau
-carnet de plongée sera détaillée.</p></div>
-</div>
-</div>
-<div class="sect1">
-<h2 id="S_NewLogbook">4. Créer un nouveau carnet de plongée</h2>
-<div class="sectionbody">
-<div class="paragraph"><p>Sélectionner <em>Fichier &#8594; Nouveau carnet de plongée</em> à partir du menu
-principal. Toutes les données de plongées sont effacées pour que de
-nouvelles puissent être ajoutées. S&#8217;il existe des données non encore
-enregistrées dans le carnet ouvert, l&#8217;utilisateur devra sélectionner s&#8217;il
-faut les enregistrer ou non avant de créer le nouveau carnet.</p></div>
-</div>
-</div>
-<div class="sect1">
-<h2 id="S_GetInformation">5. Enregistrement des informations de plongée dans le carnet</h2>
-<div class="sectionbody">
-<div class="paragraph"><p>Maintenant qu&#8217;un nouveau carnet de plongée a été créé, il est simple de lui
-ajouter des données. <em>Subsurface</em> permet plusieurs façons pour ajouter des
-données de plongée au carnet. Plus de détails dans les sections suivantes.</p></div>
-<div class="paragraph"><p>1) Si l&#8217;utilisateur possède un carnet manuscrit, un tableur ou une autre forme
-   de
- carnet maintenu manuellement, les données de plongée peuvent être ajoutées
- au carnet en utilisant une des approches suivantes :</p></div>
-<div class="ulist"><ul>
-<li>
-<p>
-Entrer les informations de plongée à la main. Cela est utile si le plongeur
-   n&#8217;a pas
- utilisé d&#8217;ordinateur de plongée et que les plongées sont inscrites dans un
- carnet manuscrit. Voir  <a href="#S_EnterData">Entrer les informations de plongée
- à la main</a>
-</p>
-</li>
-<li>
-<p>
-Importer les informations de plongée qui ont été maintenues soit dans un
-   tableur
- soit dans un fichier CSV. Se reporter à : <a href="#S_Appendix_D">ANNEXE D :
- Exporter un tableur vers le format CSV</a> et à
- <a href="#S_ImportingCSVDives">Importer des plongées au format CSV</a>.
-</p>
-</li>
-</ul></div>
-<div class="paragraph"><p>2) Si les plongées ont été enregistrées en utilisant un ordinateur de plongée,
-   le profil de profondeur de la
- plongée et de nombreuses informations supplémentaires peuvent être
- utilisées. Ces plongées peuvent être importées à partir de :</p></div>
-<div class="ulist"><ul>
-<li>
-<p>
-L&#8217;ordinateur de plongée lui-même. Voir : <a href="#S_ImportDiveComputer">Importer
-   de nouvelles informations de plongée à partir de l&#8217;ordinateur de plongée</a> ou
-</p>
-</li>
-<li>
-<p>
-Logiciels propriétaires fournis par les fabricants d&#8217;ordinateurs de
-   plongée. Voir
- <a href="#S_ImportingAlienDiveLogs">Importer les informations à partir d&#8217;autres
- sources de données numériques ou d&#8217;autres formats de données</a>.
-</p>
-</li>
-<li>
-<p>
-Importer à partir d&#8217;un tableur ou de fichiers CSV contenant les profils de
-   plongées.
- Voir : <a href="#S_ImportingCSVDives">Importer les plongées au format CSV à partir
- des ordinateurs de plongées ou d&#8217;autres logiciels de carnet de plongée</a>
-</p>
-</li>
-</ul></div>
-<div class="sect2">
-<h3 id="S_EnterData">5.1. Entrer les informations de plongée à la main</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 information for a dive: two tabs in the <strong>Info</strong> panel
-(<strong>Notes</strong> and <strong>Equipment</strong>), as well as the <strong>Dive Profile</strong> panel that displays
-a graphical profile of each dive. These panels are respectively marked
-<span class="red">A</span>, <span class="red">B</span> and <span class="red">C</span> in the figure below. Each of these tabs will
-now be explained for data entry.</p></div>
-<div class="imageblock" style="text-align:center;">
-<div class="content">
-<img src="images/AddDive1_f22.jpg" alt="FIGURE: Add dive" />
-</div>
-</div>
-<div class="paragraph"><p>When one edits a field in Notes or Equipment panels, <em>Subsurface</em> enters
-<strong>Editing Mode</strong>, indicated by the message in the blue box at the top of the
-<strong>Notes</strong> panel (see the image below). This message is displayed in all the
-panels under Notes and Equipment when in <strong>Editing Mode</strong>.</p></div>
-<div class="imageblock" style="text-align:center;">
-<div class="content">
-<img src="images/BlueEditBar_f22.jpg" alt="Blue edit bar" />
-</div>
-</div>
-<div class="paragraph"><p>The <em>Apply changes</em> button should only be selected after all the parts of a
-dive have been entered.  When entering dives by hand, the <em>Info</em>,
-<em>Equipment</em> and <em>Profile</em> tabs should be completed before saving the
-information. By selecting the <em>Apply changes</em> button, a local copy of the
-information for this specific dive is saved in memory. When one closes
-Subsurface, the program will ask again, this time whether the complete dive
-log should be saved on disk or not.</p></div>
-<div class="sect3">
-<h4 id="S_CreateProfile">5.1.1. Creating a Dive Profile</h4>
-<div class="paragraph"><p>The <strong>Dive Profile</strong> (a graphical representation of the depth of the dive as a
-function of time) is indicated in the panel on the top right hand of the
-<em>Subsurface</em> window. When a dive is manually added to a logbook,
-<em>Subsurface</em> 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_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, its position is indicated by two right-angled red lines as shown
-below.  The time and depth represented by the cursor are indicated at the
-top of the black information box (@ and D). The units (metric/imperial) on
-the axes are determined by the <strong>Preference</strong> settings. The dive profile
-itself comprises several line segments demarcated by waypoints (white dots
-on the profile, as shown above). The default dive depth is 15 m.  If the
-dive depth was 20 m then the user needs to drag the appropriate waypoints
-downwards to represent 20 m. To add a waypoint, double-click on any line
-segment. To move an additional waypoint, drag it.  To remove this waypoint,
-right-click on it and choose "Remove this point" from the context menu. Drag
-the waypoints to represent an accurate time duration for the dive. Below is
-a dive profile for a dive to 20 m for 30 min, followed by a 5 minute safety
-stop at 5 m.</p></div>
-<div class="imageblock" style="text-align:center;">
-<div class="content">
-<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 along the line segments of the dive profile. This defaults to the
-first gas mixture specified in the <strong>Equipment</strong> tab, which was air in the
-case of the profile above. The gas mixtures of segments of the dive profile
-can be edited. This is done by right-clicking on the particular waypoint and
-selecting the appropriate gas from the context menu. Changing the gas for a
-waypoint affects the gas shown in the segment <em>to the left</em> of that
-waypoint. Note that only the gases defined in the <strong>Equipment</strong> tab appear in
-the context menu (see image below).</p></div>
-<div class="imageblock" style="text-align:center;">
-<div class="content">
-<img src="images/DiveProfile3_f20.jpg" alt="FIGURE: Gas composition context menu" />
-</div>
-</div>
-<div class="paragraph"><p>With the profile having been defined, more details must be added in order to
-have a fuller record of the dive. To do this, the <strong>Notes</strong> and the
-<strong>Equipment</strong> tabs on the top left hand of the <em>Subsurface</em> window should be
-used. Click on <a href="#S_Notes_dc"><strong>this link</strong></a> for instructions to use these
-tabs.</p></div>
-</div>
-</div>
-<div class="sect2">
-<h3 id="S_ImportDiveComputer">5.2. Importer de nouvelles informations de plongée à partir de l&#8217;ordinateur de plongée</h3>
-<div class="sect3">
-<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 and of gas partial pressures. <em>Subsurface</em> can
-capture this information and present it as part of the dive information,
-using dive information from a wide range of dive computers. The latest list
-of supported dive computers can be found at:
-<a href="http://subsurface-divelog.org/documentation/supported-dive-computers/">
-Supported dive computers</a>.</p></div>
-<div class="admonitionblock">
-<table><tr>
-<td class="icon">
-<img src="images/icons/warning2.png" alt="Warning" />
-</td>
-<td class="content">Several dive computers consume more power when they are in their
-PC-Communication mode. <strong>This could drain the dive computer&#8217;s battery</strong>. We
-therefore recommend that the user checks if the dive computer is charged
-when connected to the USB port of a PC. For example, several Suunto and
-Mares dive computers do not recharge through the USB connection. Users
-should refer to the dive computer&#8217;s manual if they are unsure whether the
-dive computer recharges its batteries while connected to the USB port.</td>
-</tr></table>
-</div>
-<div class="paragraph"><p>To import dive information from a dive computer to a computer with
-<em>Subsurface</em>, it is necessary that the two pieces of equipment communicate
-with one another.  This involves setting up the communications port (or
+  <div id="toctitle">Table of Contents</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. Utilisation de ce manuel</h2>
+<div class="sectionbody">
+<div class="paragraph"><p>Lorsqu&#8217;il est ouvert depuis <em>Subsurface</em>, ce manuel n&#8217;a pas de contrôles
+externes. Cependant, une fonction de <em>RECHERCHE</em> est importante. Elle est
+activée par la combinaison de touches du clavier Ctrl-F ou commande-F. Un
+champ de recherche apparait en bas de la fenêtre. Il suffit de l&#8217;utiliser
+pour rechercher n&#8217;importe quel terme dans le manuel.</p></div>
+</div>
+</div>
+<div class="sect1">
+<h2 id="_le_sondage_utilisateur">2. Le sondage utilisateur</h2>
+<div class="sectionbody">
+<div class="paragraph"><p>Dans le but de développer <em>Subsurface</em> d&#8217;une manière qui serve ses
+utilisateurs de la meilleur manière qu&#8217;il soit, il est important d&#8217;avoir des
+informations sur les utilisateurs. À l&#8217;ouverture de <em>Subsurface</em> après avoir
+utilisé le logiciel pendant une semaine environ, une fenêtre de sondage
+apparait. Cela est complètement optionnel et l&#8217;utilisateur contrôle quelles
+informations sont envoyées ou non à l'équipe de développement de
+<em>Subsurface</em>. Toutes les données que l&#8217;utilisateur choisit d&#8217;envoyer sont
+extrêmement utiles et ne seront utilisées que pour les futures
+développements et modifications du logiciel pour coller au mieux aux besoins
+des utilisateurs de <em>Subsurface</em>. Si vous complétez le sondage ou cliquez
+sur l&#8217;option pour ne plus être sondé, cela devrait être la dernière
+communication de ce type que vous recevrez. Cependant, si vos habitudes de
+plongées ou d&#8217;utilisation de Subsurface changent, vous pouvez envoyer un
+nouveau sondage en démarrant <em>Subsurface</em> avec l&#8217;option  <em>--survey</em> sur la
+ligne de commande.</p></div>
+</div>
+</div>
+<div class="sect1">
+<h2 id="S_StartUsing">3. Commencer à utiliser le programme</h2>
+<div class="sectionbody">
+<div class="paragraph"><p>La fenêtre <em>Subsurface</em> est généralement divisée en 4 panneaux avec un <strong>Menu
+principal</strong> (Fichier Importer Journal Vue Aide) en haut de la fenêtre (pour
+Windows et Linux) ou en haut de l'écran (pour Mac et Ubuntu Unity). Les
+quatre panneaux sont :</p></div>
+<div class="paragraph"><p>La <strong>liste des plongées</strong> en bas à gauche, contenant une liste de toutes les
+plongées du journal (carnet) de plongées de l&#8217;utilisateur. Une plongée peut
+être sélectionnée et mise en surbrillance dans la liste en cliquant
+dessus. Dans la plupart des cas, les touches haut/bas peuvent être utilisée
+pour passer d&#8217;une plongée à l&#8217;autre. La <strong>liste des plongées</strong> est un outil
+important pour manipuler un journal (carnet) de plongée.</p></div>
+<div class="paragraph"><p>La <strong>carte de plongée</strong> en bas à droite, affiche les sites de plongées de
+l&#8217;utilisateur, sur une carte mondiale et centrée sur le site de la dernière
+plongée sélectionnée dans la <strong>liste des plongées</strong>.</p></div>
+<div class="paragraph"><p>Les <strong>informations</strong> en haut à gauche, fournissent des informations détaillées
+sur la plongée sélectionnée dans la <strong>liste des plongées</strong>, dont des
+statistiques pour la plongée sélectionnée ou pour toutes les plongées mises
+en surbrillance.</p></div>
+<div class="paragraph"><p>Le <strong>profil de plongée</strong> en haut à droite, affiche un profil de plongée
+graphique de la plongée sélectionnée dans la <strong>liste des plongées</strong>.</p></div>
+<div class="paragraph"><p>Les séparateurs entre ces panneaux peuvent être déplacés pour modifier la
+taille de chaque panneau. <em>Subsurface</em> mémorise la position de ces
+séparateurs, pour qu&#8217;au prochain lancement <em>Subsurface</em> utilise ces
+positions.</p></div>
+<div class="paragraph"><p>Si une unique plongée est sélectionnée dans la <strong>liste des plongées</strong>,
+l&#8217;emplacement de la plongée, les informations détaillées et le profil de la
+<em>plongée sélectionnée</em> sont affichées dans les panneaux respectifs. D&#8217;autre
+part, si plusieurs plongées sont sélectionnées, la dernière mise en
+surbrillance est la <em>plongée sélectionnée</em>, mais les données de <em>toutes les
+plongées mises en surbrillances</em> sont affichées dans l&#8217;onglet <strong>Stats</strong> du
+panneau <strong>informations</strong> (profondeur maximale, minimale et moyenne, les
+durées, les températures de l&#8217;eau et le SAC (air consommé); temps total et
+nombre de plongées sélectionnées).</p></div>
+<div class="imageblock" id="S_ViewPanels" style="text-align:center;">
+<div class="content">
+<img src="images/main_window_f22.jpg" alt="The Main Window" />
+</div>
+</div>
+<div class="paragraph"><p>L&#8217;utilisateur peut déterminer si lesquels des quatre panneaux sont affichés
+en sélectionnant l&#8217;option <strong>Vue</strong> dans le menu principal. Cette fonctionnalité
+permet plusieurs choix d&#8217;affichage :</p></div>
+<div class="paragraph"><p><strong>Tout</strong> : affiche les quatre panneaux tels que sur la capture d'écran ci-dessus.</p></div>
+<div class="paragraph"><p><strong>Liste des plongées</strong> : affiche uniquement la liste des plongées.</p></div>
+<div class="paragraph"><p><strong>Profil</strong> : affiche uniquement le profile de plongée de la plongée sélectionnée.</p></div>
+<div class="paragraph"><p><strong>Info</strong> : affiche uniquement les notes de plongées de la dernière plongée sélectionnée et les statistiques pour
+toutes les plongées mises en surbrillance.</p></div>
+<div class="paragraph"><p><strong>Globe</strong> : affiche uniquement la carte mondiale, centrée sur la dernière plongée sélectionnée.</p></div>
+<div class="paragraph"><p>Comme la plupart des autre fonctions qui peuvent être accédée via le menu
+principal, ces options peuvent être utilisées par des raccourcis
+clavier. Les raccourcis pour un système particulier sont affichés avec un
+souligné des les entrées de menu. À cause des différents systèmes
+d&#8217;exploitation et des divers langues, <em>Subsurface</em> peut utiliser différentes
+touches de raccourcis et ne sont donc pas détaillées ici.</p></div>
+<div class="paragraph"><p>Lorsque le programme est lancé pour la première fois, il n&#8217;affiche aucune
+information. Ceci parce que le programme n&#8217;a aucune information de plongée
+disponible. Dans les sections suivantes, le procédure pour créer a nouveau
+carnet de plongée sera détaillée.</p></div>
+</div>
+</div>
+<div class="sect1">
+<h2 id="S_NewLogbook">4. Créer un nouveau carnet de plongée</h2>
+<div class="sectionbody">
+<div class="paragraph"><p>Sélectionner <em>Fichier &#8594; Nouveau carnet de plongée</em> à partir du menu
+principal. Toutes les données de plongées sont effacées pour que de
+nouvelles puissent être ajoutées. S&#8217;il existe des données non encore
+enregistrées dans le carnet ouvert, l&#8217;utilisateur devra sélectionner s&#8217;il
+faut les enregistrer ou non avant de créer le nouveau carnet.</p></div>
+</div>
+</div>
+<div class="sect1">
+<h2 id="S_GetInformation">5. Enregistrement des informations de plongée dans le carnet</h2>
+<div class="sectionbody">
+<div class="paragraph"><p>Maintenant qu&#8217;un nouveau carnet de plongée a été créé, il est simple de lui
+ajouter des données. <em>Subsurface</em> permet plusieurs façons pour ajouter des
+données de plongée au carnet. Plus de détails dans les sections suivantes.</p></div>
+<div class="paragraph"><p>1) Si l&#8217;utilisateur possède un carnet manuscrit, un tableur ou une autre forme
+   de
+ carnet maintenu manuellement, les données de plongée peuvent être ajoutées
+ au carnet en utilisant une des approches suivantes :</p></div>
+<div class="ulist"><ul>
+<li>
+<p>
+Entrer les informations de plongée à la main. Cela est utile si le plongeur
+   n&#8217;a pas
+ utilisé d&#8217;ordinateur de plongée et que les plongées sont inscrites dans un
+ carnet manuscrit. Voir  <a href="#S_EnterData">Entrer les informations de plongée
+ à la main</a>
+</p>
+</li>
+<li>
+<p>
+Importer les informations de plongée qui ont été maintenues soit dans un
+   tableur
+ soit dans un fichier CSV. Se reporter à : <a href="#S_Appendix_D">ANNEXE D :
+ Exporter un tableur vers le format CSV</a> et à
+ <a href="#S_ImportingCSVDives">Importer des plongées au format CSV</a>.
+</p>
+</li>
+</ul></div>
+<div class="paragraph"><p>2) Si les plongées ont été enregistrées en utilisant un ordinateur de plongée,
+   le profil de profondeur de la
+ plongée et de nombreuses informations supplémentaires peuvent être
+ utilisées. Ces plongées peuvent être importées à partir de :</p></div>
+<div class="ulist"><ul>
+<li>
+<p>
+L&#8217;ordinateur de plongée lui-même. Voir : <a href="#S_ImportDiveComputer">Importer
+   de nouvelles informations de plongée à partir de l&#8217;ordinateur de plongée</a> ou
+</p>
+</li>
+<li>
+<p>
+Logiciels propriétaires fournis par les fabricants d&#8217;ordinateurs de
+   plongée. Voir
+ <a href="#S_ImportingAlienDiveLogs">Importer les informations à partir d&#8217;autres
+ sources de données numériques ou d&#8217;autres formats de données</a>.
+</p>
+</li>
+<li>
+<p>
+Importer à partir d&#8217;un tableur ou de fichiers CSV contenant les profils de
+   plongées.
+ Voir : <a href="#S_ImportingCSVDives">Importer les plongées au format CSV à partir
+ des ordinateurs de plongées ou d&#8217;autres logiciels de carnet de plongée</a>
+</p>
+</li>
+</ul></div>
+<div class="sect2">
+<h3 id="S_EnterData">5.1. Entrer les informations de plongée à la main</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 information for a dive: two tabs in the <strong>Info</strong> panel
+(<strong>Notes</strong> and <strong>Equipment</strong>), as well as the <strong>Dive Profile</strong> panel that displays
+a graphical profile of each dive. These panels are respectively marked
+<span class="red">A</span>, <span class="red">B</span> and <span class="red">C</span> in the figure below. Each of these tabs will
+now be explained for data entry.</p></div>
+<div class="imageblock" style="text-align:center;">
+<div class="content">
+<img src="images/AddDive1_f22.jpg" alt="FIGURE: Add dive" />
+</div>
+</div>
+<div class="paragraph"><p>When one edits a field in Notes or Equipment panels, <em>Subsurface</em> enters
+<strong>Editing Mode</strong>, indicated by the message in the blue box at the top of the
+<strong>Notes</strong> panel (see the image below). This message is displayed in all the
+panels under Notes and Equipment when in <strong>Editing Mode</strong>.</p></div>
+<div class="imageblock" style="text-align:center;">
+<div class="content">
+<img src="images/BlueEditBar_f22.jpg" alt="Blue edit bar" />
+</div>
+</div>
+<div class="paragraph"><p>The <em>Apply changes</em> button should only be selected after all the parts of a
+dive have been entered.  When entering dives by hand, the <em>Info</em>,
+<em>Equipment</em> and <em>Profile</em> tabs should be completed before saving the
+information. By selecting the <em>Apply changes</em> button, a local copy of the
+information for this specific dive is saved in memory. When one closes
+Subsurface, the program will ask again, this time whether the complete dive
+log should be saved on disk or not.</p></div>
+<div class="sect3">
+<h4 id="S_CreateProfile">5.1.1. Creating a Dive Profile</h4>
+<div class="paragraph"><p>The <strong>Dive Profile</strong> (a graphical representation of the depth of the dive as a
+function of time) is indicated in the panel on the top right hand of the
+<em>Subsurface</em> window. When a dive is manually added to a logbook,
+<em>Subsurface</em> 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_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, its position is indicated by two right-angled red lines as shown
+below.  The time and depth represented by the cursor are indicated at the
+top of the black information box (@ and D). The units (metric/imperial) on
+the axes are determined by the <strong>Preference</strong> settings. The dive profile
+itself comprises several line segments demarcated by waypoints (white dots
+on the profile, as shown above). The default dive depth is 15 m.  If the
+dive depth was 20 m then the user needs to drag the appropriate waypoints
+downwards to represent 20 m. To add a waypoint, double-click on any line
+segment. To move an additional waypoint, drag it.  To remove this waypoint,
+right-click on it and choose "Remove this point" from the context menu. Drag
+the waypoints to represent an accurate time duration for the dive. Below is
+a dive profile for a dive to 20 m for 30 min, followed by a 5 minute safety
+stop at 5 m.</p></div>
+<div class="imageblock" style="text-align:center;">
+<div class="content">
+<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 along the line segments of the dive profile. This defaults to the
+first gas mixture specified in the <strong>Equipment</strong> tab, which was air in the
+case of the profile above. The gas mixtures of segments of the dive profile
+can be edited. This is done by right-clicking on the particular waypoint and
+selecting the appropriate gas from the context menu. Changing the gas for a
+waypoint affects the gas shown in the segment <em>to the left</em> of that
+waypoint. Note that only the gases defined in the <strong>Equipment</strong> tab appear in
+the context menu (see image below).</p></div>
+<div class="imageblock" style="text-align:center;">
+<div class="content">
+<img src="images/DiveProfile3_f20.jpg" alt="FIGURE: Gas composition context menu" />
+</div>
+</div>
+<div class="paragraph"><p>With the profile having been defined, more details must be added in order to
+have a fuller record of the dive. To do this, the <strong>Notes</strong> and the
+<strong>Equipment</strong> tabs on the top left hand of the <em>Subsurface</em> window should be
+used. Click on <a href="#S_Notes_dc"><strong>this link</strong></a> for instructions to use these
+tabs.</p></div>
+</div>
+</div>
+<div class="sect2">
+<h3 id="S_ImportDiveComputer">5.2. Importer de nouvelles informations de plongée à partir de l&#8217;ordinateur de plongée</h3>
+<div class="sect3">
+<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 and of gas partial pressures. <em>Subsurface</em> can
+capture this information and present it as part of the dive information,
+using dive information from a wide range of dive computers. The latest list
+of supported dive computers can be found at:
+<a href="http://subsurface-divelog.org/documentation/supported-dive-computers/">
+Supported dive computers</a>.</p></div>
+<div class="admonitionblock">
+<table><tr>
+<td class="icon">
+<img src="images/icons/warning2.png" alt="Warning" />
+</td>
+<td class="content">Several dive computers consume more power when they are in their
+PC-Communication mode. <strong>This could drain the dive computer&#8217;s battery</strong>. We
+therefore recommend that the user checks if the dive computer is charged
+when connected to the USB port of a PC. For example, several Suunto and
+Mares dive computers do not recharge through the USB connection. Users
+should refer to the dive computer&#8217;s manual if they are unsure whether the
+dive computer recharges its batteries while connected to the USB port.</td>
+</tr></table>
+</div>
+<div class="paragraph"><p>To import dive information from a dive computer to a computer with
+<em>Subsurface</em>, it is necessary that the two pieces of equipment communicate
+with one another.  This involves setting up the communications port (or
 mount point) of the computer with <em>Subsurface</em> that communicates with the
 dive computer. In order to set up this communication, one needs to find the
 appropriate information to instruct <em>Subsurface</em> where and how to import the
 dive information.
 <a href="#_appendix_a_operating_system_specific_information_for_importing_dive_information_from_a_dive_computer">Appendix
 A</a> provides the technical information to help the user achieving this for
-different operating systems and
-<a href="#_appendix_b_dive_computer_specific_information_for_importing_dive_information">Appendix
-B</a> has dive computer specific information.</p></div>
-<div class="paragraph"><p>After this, the dive computer can be hooked up to the user&#8217;s PC, which can
-be achieved by following these steps:</p></div>
-<div class="olist arabic"><ol class="arabic">
-<li>
-<p>
-The interface cable should be connected to a free USB port (or the Infra-red
-        or Bluetooth connection set up as described later in this manual)
-</p>
-</li>
-<li>
-<p>
-The dive computer should be placed into PC Communication mode.
-        (Se reporter au manuel de l&#8217;ordinateur de plongée)
-</p>
-</li>
-<li>
-<p>
-In <em>Subsurface</em>, from the Main Menu, select <em>Import &#8594; Import From Dive
-   Computer</em>.  Dialogue <strong>A</strong> in the figure below appears:
-</p>
-</li>
-</ol></div>
-<div class="imageblock" style="text-align:center;">
-<div class="content">
-<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, if the dive computer allows this, <em>Subsurface</em> only imports dives
-that have not been uploaded before. This makes the download process faster
-on most dive computers and also saves battery power of the dive computer (at
-least for those not charging while connected via USB).</p></div>
-<div class="ulist"><ul>
-<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).
-</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
+different operating systems and
+<a href="#_appendix_b_dive_computer_specific_information_for_importing_dive_information">Appendix
+B</a> has dive computer specific information.</p></div>
+<div class="paragraph"><p>After this, the dive computer can be hooked up to the user&#8217;s PC, which can
+be achieved by following these steps:</p></div>
+<div class="olist arabic"><ol class="arabic">
+<li>
+<p>
+The interface cable should be connected to a free USB port (or the Infra-red
+        or Bluetooth connection set up as described later in this manual)
+</p>
+</li>
+<li>
+<p>
+The dive computer should be placed into PC Communication mode.
+        (Se reporter au manuel de l&#8217;ordinateur de plongée)
+</p>
+</li>
+<li>
+<p>
+In <em>Subsurface</em>, from the Main Menu, select <em>Import &#8594; Import From Dive
+   Computer</em>.  Dialogue <strong>A</strong> in the figure below appears:
+</p>
+</li>
+</ol></div>
+<div class="imageblock" style="text-align:center;">
+<div class="content">
+<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, if the dive computer allows this, <em>Subsurface</em> only imports dives
+that have not been uploaded before. This makes the download process faster
+on most dive computers and also saves battery power of the dive computer (at
+least for those not charging while connected via USB).</p></div>
+<div class="ulist"><ul>
+<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).
+</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
@@ -830,74 +830,74 @@ The <strong>Device or Mount Point</strong> drop-down list contains the USB or Bl
 <p>
 If all the dives on the dive computer need to be downloaded, check the
    checkbox <em>Force download of all dives</em>. Normally, <em>Subsurface</em> only
-   downloads dives after the date-time of the last dive in the <strong>Dive List</strong>
-   panel. If one or more of your dives in <em>Subsurface</em> have been accidentally
-   deleted or if there are older dives that still need to be downloaded from
-   the dive computer, this checkbox needs to be activated. Some dive computers
-   (e.g. Mares Puck) do not provide a contents list to <em>Subsurface</em> before the
-   download in order to select only new dives.  Consequently, for these dive
-   computers, all dives are downloaded irrespective of the status of this check
-   box.
-</p>
-</li>
-<li>
-<p>
-If the checkbox <em>Always prefer downloaded dives</em> has been checked and,
-   during download, dives with identical date-times exist on the dive computer
-   and on the <em>Subsurface</em> <strong>Dive List</strong> panel, the dive in the <em>Subsurface</em>
-   divelog will be overwritten by the dive record from the dive computer.
-</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).
-</p>
-</li>
-<li>
-<p>
-Then select the <em>Download</em> button.  With communication established, one can
-   see how the data are retrieved from the dive computer.  Depending on the
-   make of the dive computer and/or number of recorded dives, this could take
-   some time. Be patient. The <em>Download</em> dialogue shows a progress bar at the
-   bottom of the dialogue (for some dive computers the progress information
-   could be inaccurate as we cannot determine how much downloadable data there
-   is until all data have been downloaded). After successful download, Dialogue
-   <strong>B</strong> in the figure above appears.  After the dives have been downloaded, they
-   appear in a tabular format on the right-hand side of the dialogue (see image
-   <strong>B</strong>, above). Each dive comprises a row in the table, with the date, duration
-   and depth shown. Next to each dive is a checkbox: check all the dives that
-   need to be transferred to the <strong>Dive List</strong>. In the case of the image above,
-   the last six dives are checked and will be transferred to the <strong>Dive
-   List</strong>. Then click the <em>OK</em> button at the bottom of the dialogue. All the
-   imported dives appear in the <strong>Dive List</strong>, sorted by date and
-   time. Disconnect and switch off the dive computer to conserve its battery
-   power.
-</p>
-</li>
-</ul></div>
-<div class="paragraph"><p>After this has been completed, select the OK button.  The checked dives are
-transferred 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.
-</p>
-</li>
-</ul></div>
-<div class="sidebarblock">
-<div class="content">
-<div class="paragraph"><p><strong>PROBLEMS WITH DATA DOWNLOAD FROM A DIVE COMPUTER?</strong></p></div>
-<div class="admonitionblock">
+   downloads dives after the date-time of the last dive in the <strong>Dive List</strong>
+   panel. If one or more of your dives in <em>Subsurface</em> have been accidentally
+   deleted or if there are older dives that still need to be downloaded from
+   the dive computer, this checkbox needs to be activated. Some dive computers
+   (e.g. Mares Puck) do not provide a contents list to <em>Subsurface</em> before the
+   download in order to select only new dives.  Consequently, for these dive
+   computers, all dives are downloaded irrespective of the status of this check
+   box.
+</p>
+</li>
+<li>
+<p>
+If the checkbox <em>Always prefer downloaded dives</em> has been checked and,
+   during download, dives with identical date-times exist on the dive computer
+   and on the <em>Subsurface</em> <strong>Dive List</strong> panel, the dive in the <em>Subsurface</em>
+   divelog will be overwritten by the dive record from the dive computer.
+</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).
+</p>
+</li>
+<li>
+<p>
+Then select the <em>Download</em> button.  With communication established, one can
+   see how the data are retrieved from the dive computer.  Depending on the
+   make of the dive computer and/or number of recorded dives, this could take
+   some time. Be patient. The <em>Download</em> dialogue shows a progress bar at the
+   bottom of the dialogue (for some dive computers the progress information
+   could be inaccurate as we cannot determine how much downloadable data there
+   is until all data have been downloaded). After successful download, Dialogue
+   <strong>B</strong> in the figure above appears.  After the dives have been downloaded, they
+   appear in a tabular format on the right-hand side of the dialogue (see image
+   <strong>B</strong>, above). Each dive comprises a row in the table, with the date, duration
+   and depth shown. Next to each dive is a checkbox: check all the dives that
+   need to be transferred to the <strong>Dive List</strong>. In the case of the image above,
+   the last six dives are checked and will be transferred to the <strong>Dive
+   List</strong>. Then click the <em>OK</em> button at the bottom of the dialogue. All the
+   imported dives appear in the <strong>Dive List</strong>, sorted by date and
+   time. Disconnect and switch off the dive computer to conserve its battery
+   power.
+</p>
+</li>
+</ul></div>
+<div class="paragraph"><p>After this has been completed, select the OK button.  The checked dives are
+transferred 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.
+</p>
+</li>
+</ul></div>
+<div class="sidebarblock">
+<div class="content">
+<div class="paragraph"><p><strong>PROBLEMS WITH DATA DOWNLOAD FROM A DIVE COMPUTER?</strong></p></div>
+<div class="admonitionblock">
 <table><tr>
 <td class="icon">
 <img src="images/icons/important.png" alt="Important" />
@@ -964,5851 +964,5851 @@ checked, no dives are added to the
 <div class="literalblock">
 <div class="content">
 <pre><code>subsurface.log
-subsurface.bin</code></pre>
-</div></div>
-<div class="paragraph"><p>These files should be send to the <em>Subsurface</em> mail list:
-<em>subsurface@subsurface-divelog.org</em> with a request for the files to be
-analysed. Provide the dive computer make and model as well as contextual
-information about the dives recorded on the dive computer.</p></div>
-</div></div>
-</div>
-<div class="sect3">
-<h4 id="S_Bluetooth">5.2.2. Connecting <em>Subsurface</em> to a Bluetooth-enabled dive computer</h4>
-<div class="paragraph"><p>Bluetooth is becoming a more common way of communication between dive
-computers and <em>Subsurface</em>, for instance, the Shearwater Petrel Mk2 and the
-OSTC Mk3. <em>Subsurface</em> provides a largely operating system independent
-Bluetooth interface. Setting up <em>Subsurface</em> for Bluetooth communication
-requires four steps:</p></div>
-<div class="ulist"><ul>
-<li>
-<p>
-Ensure that Bluetooth is activated on the host computer running
-  <em>Subsurface</em>.
-</p>
-</li>
-<li>
-<p>
-Ensure that <em>Subsurface</em> sees the Bluetooth adapter on the host computer.
-</p>
-</li>
-<li>
-<p>
-Ensure the Bluetooth-enabled dive computer is Bluetooth-discoverable and in
-  PC upload mode.
-</p>
-</li>
-<li>
-<p>
-Ensure that <em>Subsurface</em> is paired with the Bluetooth-enabled dive computer.
-</p>
-</li>
-</ul></div>
-<div class="paragraph"><p>Select the Download dialogue by selecting <em>Import &#8594; Import from dive
-computer</em> from the <strong>Main Menu</strong>. If one checks the check box labelled
-<em>"Choose Bluetooth download mode"</em>, the dialogue below appears.</p></div>
-<div class="sect4">
-<h5 id="_sur_linux_ou_macos">Sur Linux ou MacOS :</h5>
-<div class="imageblock" style="text-align:center;">
-<div class="content">
-<img src="images/DC_import_Bluetooth.jpg" alt="FIGURE: Download Bluetooth" />
-</div>
-</div>
-<div class="paragraph"><p>On the <em>Linux</em> or <em>MacOS</em> platforms the name of the <em>Subsurface</em> computer
-and its Bluetooth address are shown on the right-hand side, On the lefthand
-side, if the computer has connected more than one local Bluetooth devices
-the user can use the list box to indicate which one needs to connect to
-<em>Subsurface</em>.  The power state (on/off) of the Bluetooth adapter is shown
-below the address and can be changed by checking the <em>Turn on/off</em> check
-box.</p></div>
-<div class="paragraph"><p>If the Bluetooth address is not shown, then <em>Subsurface</em> does not see the
-local Bluetooth device. Ensure that the Bluetooth driver is installed
-correctly on the <em>Subsurface</em> computer and check if it can be used by other
-Bluetooth utilities like <em>bluetoothctl</em> or <em>bluemoon</em>. This achieves the
-first two steps above.</p></div>
-<div class="paragraph"><p>Ensure that the Bluetooth-enabled dive computer is in PC-upload mode and
-that it is discoverable by other Bluetooth devices. Consult the manual of
-the dive computer to perform this. Now the third item in the list above has
-been achieved.</p></div>
-<div class="paragraph"><p>Select the <em>Scan</em> button towards the bottom left of the dialogue
-above. After searching for a small amount of time, the dive computer should
-be listed (perhaps as one of a number of Bluetooth devices) in the main list
-box on the lefthand side of the dialogue (see image above). If this is not
-achieved, select the <em>Clear</em> button and then scan again for Bluetooth
-devices using the <em>Scan</em> button. After performing these actions <em>Subsurface</em>
-should see the dive computer.  The label of the discovered dive computer
-contains the name of the device, its address and its pairing status. If the
-device is not paired and has a red background colour, a context menu can be
-opened by selecting the item with a right-click.  Select the the <em>Pair</em>
-option and wait for the task to complete.</p></div>
-<div class="sidebarblock">
-<div class="content">
-<div class="admonitionblock">
-<table><tr>
-<td class="icon">
-<img src="images/icons/important.png" alt="Important" />
-</td>
-<td class="content">Currently <em>Subsurface</em> does not support Bluetooth pairing with dive
-computers that require a custom PIN code. In order to pair the devices, use
-other OS utilities as suggested below.</td>
-</tr></table>
-</div>
-<div class="paragraph"><p>One way to achieve this is to use <code>bluetoothctl</code>:</p></div>
-<div class="literalblock">
-<div class="content">
-<pre><code>$ bluetoothctl
-[bluetooth]# agent KeyboardOnly
-Agent registered
-[bluetooth]# default-agent
-Default agent request successful
-[bluetooth]# pair 00:80:25:49:6C:E3
-Attempting to pair with 00:80:25:49:6C:E3
-[CHG] Device 00:80:25:49:6C:E3 Connected: yes
-Request PIN code
-[agent] Enter PIN code: 0000</code></pre>
-</div></div>
-</div></div>
-<div class="paragraph"><p>After the devices are paired the <em>Save</em> button of the dialogue can be
-pressed.  This closes the Bluetooth dialogue. Now select <em>Download</em> in the
-<em>Download from dive computer</em> dialogue which should still be open. The
-downloaded dives are shown on the righthand side of the download dialogue.</p></div>
-</div>
-<div class="sect4">
-<h5 id="_sur_windows">Sur Windows :</h5>
-<div class="imageblock" style="text-align:center;">
-<div class="content">
-<img src="images/DC_import_Bluetooth_Windows.png" alt="FIGURE: Download Bluetooth on Windows" />
-</div>
-</div>
-<div class="paragraph"><p>On <em>Windows</em> platforms the <em>Local Bluetooth device details section</em> on the
-right is not displayed.  To successfully initiate a scan (by pressing the
-<em>Scan</em> button)  check that the Bluetooth device on the <em>Subsurface</em> computer
-is turned on.</p></div>
-<div class="paragraph"><p>The pairing step is checked and done automatically during the download
-process. If the devices have never been paired the system will ask for your
-permissions and put a message on the right side of the screen: <em>Add a
-device, Tap to set up your DC device</em>. Always allow this pairing. After a
-discovered item is selected, select the <em>Save</em> button.  Finally select the
-<em>Download</em> button on the <em>Download</em> dialogue and wait for the process to
-complete.</p></div>
-<div class="admonitionblock">
-<table><tr>
-<td class="icon">
-<img src="images/icons/important.png" alt="Important" />
-</td>
-<td class="content">Be aware that currently <em>Subsurface</em> works only with local Bluetooth
-adapters which use Microsoft Bluetooth Stack. If the local device uses
-<em>Widcomm</em>, <em>Stonestreet One Bluetopia Bluetooth</em> or <em>BlueSolei</em> drivers it
-will definitely not work.</td>
-</tr></table>
-</div>
-<div class="paragraph"><p>A log messageOn the bottom left of the <em>Remote Bluetooth device selection</em>
-shows details about the current status of the Bluetooth agent. To select
-another dive computer for download using the "Remote Bluetooth selection
-dialogue" press the three-dots button from the <em>"Choose Bluetooth download
-mode"</em> option.</p></div>
-<div class="admonitionblock">
-<table><tr>
-<td class="icon">
-<img src="images/icons/important.png" alt="Important" />
-</td>
-<td class="content"><strong>IN CASE OF PROBLEMS</strong>:  If the Bluetooth adapter from the <em>Subsurface</em> computer
-gets stuck and the <em>Download</em> process fails repeatedly,
- <em>unpair</em> the devices and then repeat the above steps. If this is not successful,
- <a href="#S_HowFindBluetoothDeviceName"><em>Appendix A</em></a> contains
-information for manually setting up and inspecting the Bluetooth connection
-with <em>Subsurface</em>.</td>
-</tr></table>
-</div>
-</div>
-</div>
-<div class="sect3">
-<h4 id="S_DeviceNames">5.2.3. Changing the name of a dive computer</h4>
-<div class="paragraph"><p>It may be necessary to distinguish between different dive computers used to
-upload dive logs to <em>Subsurface</em>. For instance if one&#8217;s partner&#8217;s dive
-computer is the same make and model as one&#8217;s own and dive logs are uploaded
-from both dive computers to the same <em>Subsurface</em> computer, then one would
-perhaps like to call one dc "Alice&#8217;s Suunto D4" and the other one "Bob&#8217;s
-Suunto D4". Alternatively, consider a technical diver dives with two or more
-dive computers of the same model, the logs of both (or all) being uploaded.
-In this case it might be prudent to call one of them "Suunto D4 (1)" and
-another one "Suunto D4 (2)". This is easily done in <em>Subsurface</em>.  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">5.2.4. Updating the dive information imported from the dive computer.</h4>
-<div class="paragraph"><p>With the uploaded dives in the <strong>Dive List</strong>, the information from the dive
-computer is not complete and more details must be added in order to have a
-fuller record of the dives. To do this, the <strong>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 class="sect4">
-<h5 id="S_Notes_dc">Notes</h5>
-<div class="paragraph"><p>To have a more complete dive record the user needs to add additional
-information by hand. The procedure below is virtually identical for
-hand-entered dives and for dives downloaded from a dive computer.</p></div>
-<div class="paragraph"><p>In some cases, one has to provide the date and time of the dive, e.g. when
-entering a dive by hand or when a dive computer does not provide the date
-and time of the dive.  (Usually the date and time of the dive, gas mixture
-and water temperature are shown as obtained from the dive computer)  If the
-contents of the <strong>Notes tab</strong> is changed or edited in any way, the message in
-a blue box at the top of the panel indicates that the dive is being
-edited. If one clicks on the <strong>Notes</strong> tab, the following fields are visible
-(left hand image, below):</p></div>
-<div class="imageblock" style="text-align:center;">
-<div class="content">
-<img src="images/AddDive3_f22.jpg" alt="FIGURE: The Notes tab" />
-</div>
-</div>
-<div class="paragraph"><p>The right hand image, above, shows a <strong>Notes tab</strong> filled with dive
-information.  The <strong>Time</strong> field reflects the date and time of the dive. By
-clicking the date, a calendar is displayed from which one can choose the
-correct date. Press ESC to close the calendar.  The time values (hour and
-minutes) can also be edited directly by clicking on each of them in the text
-box and by over-typing the information displayed.</p></div>
-<div class="paragraph"><p><strong>Air/water temperatures</strong>: Air and water temperatures during the dive are shown
-in text boxes to the right of the Start time. Many dive computers supply water
-temperature information and this box may therefore contain information.
-If air temperature is not provided by the dive computer, the first temperature reading
-might be used for the air temperature. Generally this is close enough to the real air temperature as
-the change in the temperature sensor reading is quite slow to follow the changes in the environment.
-If editing is required, only a value is required, the units of temperature will be
-automatically supplied by
-<em>Subsurface</em> (following the <em>Preferences</em>, metric or imperial units will
-be used).</p></div>
-<div class="paragraph"><p><strong>Location</strong>:</p></div>
-<div class="admonitionblock">
-<table><tr>
-<td class="icon">
-<img src="images/icons/warning2.png" alt="Warning" />
-</td>
-<td class="content">Dive locations are managed as a <strong>separate</strong> part of the dive log.  The dive
-information in the <strong>Notes</strong> and <strong>Equipment</strong> tabs can therefore not be edited
-at the same time as the dive site information. Save all the other dive
-information (e.g.  divemaster, buddy, protective gear, notes about the dive)
-by selecting <em>Apply changes</em> on the <strong>Notes</strong> tab before editing the dive site
-information. Only then, supply a dive site name in the textbox labelled
-<em>Location</em> on the <strong>Notes</strong> tab.</td>
-</tr></table>
-</div>
-<div class="paragraph"><p>Type the name of the dive site, e.g. "Tihany, Lake Balaton, Hungary".  If
-several dives are performed at the same location, the dive site information
-for the first dive is re-used.  Existing dive location information can be
-edited at any time by selecting (on the <strong>Dive List</strong> panel) a dive performed
-at that site and by opening the location information by clicking the globe
-button on the right of the location name (see image on the right,
-above). When entering a dive location name, auto location of dive site names
-makes it easy to select an existing dive site name (i.e. when typing the
-name of a dive site, a dropdown list appears showing all sites with similar
-names). If the dive site has been used before, click on the already-existing
-name.  The dive site names in the dropdown list contain either a globe
-symbol (indicating existing dive sites in the <em>Subsurface</em> database)  or a
-<strong>+</strong> symbol (indicating dive site names that appear consistent with the
-current dive site name but which have not been added to the dive site
-database).  Therefore, if the present dive site has not been used before, a
-message appears as follows (image <strong>A</strong> below):</p></div>
-<div class="imageblock" style="text-align:center;">
-<div class="content">
-<img src="images/Locations1_f22.jpg" alt="FIGURE:Location description panel" />
-</div>
-</div>
-<div class="paragraph"><p>Doubleclick on the new dive site name. A panel appears to enter the
-coordinates and other important information about the site (image <strong>B</strong>,
-above). The most important items are the coordinates of the site. There are
-three ways of specifying the coordinates:</p></div>
-<div class="olist loweralpha"><ol class="loweralpha">
-<li>
-<p>
-One can find the coordinates on the world map in the bottom right hand part
-   of the <em>Subsurface</em> window. The map displays an orange bar indicating "No
-   location data - Move the map and double-click to set the dive
-   location". Upon a doubleclick at the appropriate place, the orange bar
-   disappears and the coordinates are stored.
-</p>
-</li>
-<li>
-<p>
-The coordinates can be obtained from the <em>Subsurface</em> Companion app if the
-   user has an Android or iPhone device with GPS and if the coordinates of the
-   dive site were stored using that device.  <a href="#S_Companion">Click here for
-   more information</a>
-</p>
-</li>
-<li>
-<p>
-The coordinates can be entered by hand if they are known, using one of four
-   formats with latitude followed by longitude:
-</p>
-<div class="literalblock">
-<div class="content">
-<pre><code>ISO 6709 Annex D format e.g. 30°13'28.9"N 30°49'1.5"E Degrees and decimal
-minutes, e.g. N30° 13.49760' , E30° 49.30788' Degrees minutes seconds,
-e.g. N30° 13' 29.8" , E30° 49' 1.5" Decimal degrees, e.g. 30.22496 ,
-30.821798</code></pre>
-</div></div>
-</li>
-</ol></div>
-<div class="paragraph"><p>Southern hemisphere latitudes are given with a <strong>S</strong>, e.g. S30°, or with a
-negative value, e.g. -30.22496. Similarly western longitudes are given with
-a <strong>W</strong>, e.g. W07°, or with a negative value, e.g. -7.34323. Some keyboards
-don&#8217;t have the degree sign (°). It can be replaced by a <strong>d</strong> like this: N30d
-W20d.  If both a dive site name and coordinates have been provided, Save the
-dive site information by selecting the button <em>Apply changes</em> at the top of
-the panel.</p></div>
-<div class="paragraph"><p><strong>Important</strong>: GPS coordinates of a dive site are linked to the Location
-name - so <strong>saving</strong> a dive site with only coordinates and no dive site name
-causes unexpected behaviour (Subsurface will think that all of these
-dives have the same location and try to keep their GPS coordinates the
-same).</p></div>
-<div class="paragraph"><p><strong>Dive site name lookup:</strong> If coordinates have been typed into the appropriate
-text box, one can perform an automated name lookup based on the coordinates.
-This is achieved when <em>Subsurface</em> uses the Internet to find the name of the dive site
-based on the coordinates that were typed. If a name has been found, it is
-automatically inserted into the tags box. The list box
-(Titled <em>Dive sites on same coordinates</em>") at the bottom
-of the dive site panel contains the names of other dives sites used at the
-current location. For instance if the dive site is "Blue Hole" and there are several
-dive sites named "Blue Hole", all these sites are listed in this list box.</p></div>
-<div class="paragraph"><p>Enter any other textual information about the dive site (Description and
-Notes), then select <em>Apply Changes</em> to save the geolocation for this dive
-site. At a later stage the dive site information can be edited by clicking
-the globe icon to the right of the dive site name in the <strong>Notes tab</strong>.</p></div>
-<div class="paragraph"><p><strong>Dive mode</strong>: This is a dropdown box allowing one to choose the type of dive
-performed. The options are OC (Open Circuit SCUBA, the default seting, meant for most recreational dives),
-Freedive (dive without SCUBA equipment), CCR (Closed-circuit
-rebreather) and pSCR (Passive semi-closed rebreather).</p></div>
-<div class="paragraph"><p><strong>Divemaster</strong>: The name of the dive master or dive guide for this dive should be
-entered in this field
-which offers auto selection based on the list of dive masters in
-the current logbook.</p></div>
-<div class="paragraph"><p><strong>Buddy</strong>: In this field, one enters the name(s) of the buddy / buddies
-(separated with commas) who accompanied him/her on the
-dive. Auto selection based on the list of buddies in the current logbook is
-offered.</p></div>
-<div class="paragraph"><p><strong>Suit</strong>: Here the type of dive suit used can be entered.
-Auto selection of the suit description is available.
-Some dry-suit users may choose to use this field to record what combination of
-suit and thermal undersuit was used.</p></div>
-<div class="paragraph"><p><strong>Rating</strong>: One can provide a subjective overall rating of the dive on a
-5-point scale by clicking the appropriate star on the rating scale.</p></div>
-<div class="paragraph"><p><strong>Visibility</strong>: Similarly, one can provide a rating of visibility during the
-dive on a
-5-point scale by clicking the appropriate star.</p></div>
-<div class="paragraph"><p><strong>Tags</strong>: Tags that describe the type of dive performed can be entered
-here (separated by commas). Examples of common tags are boat, drift, training,
-cave, etc.
-<em>Subsurface</em> has many built-in tags. If the user starts typing a tag, the
-program
-will list the tags that correspond to the typing. For instance, if the user
-typed
-<code>cav</code>, then the tags <strong>cave</strong> and <strong>cavern</strong> are shown for the user to choose from.</p></div>
-<div class="paragraph"><p><strong>Notes</strong>: Any additional information for the dive can be entered here.</p></div>
-<div class="paragraph"><p>The <em>Apply changes</em> and <em>Discard changes</em> buttons are used to save all the
-information for tabs in the <strong>Info</strong> panel and in the <strong>Dive Profile</strong> panel, so
-there&#8217;s no need to use them until <strong>ALL</strong> other information has been
-added. The image <a href="#S_Notes_dc">at the beginning of this section</a> shows an
-example of a <strong>Notes tab</strong> after completion of the dive information.</p></div>
-</div>
-<div class="sect4">
-<h5 id="_equipment">Equipment</h5>
-<div class="paragraph"><p>The Equipment tab allows one to enter information about the type of cylinder
-and gas used as well as the weights used for the dive. The message in a blue
-box at the top of the panel:</p></div>
-<div class="imageblock" style="text-align:center;">
-<div class="content">
-<img src="images/BlueEditBar_f22.jpg" alt="FIGURE: Blue edit bar" />
-</div>
-</div>
-<div class="paragraph"><p>indicates that the dive is being edited. This is a highly interactive part
-of <em>Subsurface</em> and the information on cylinders and gases (entered here)
-determines the behaviour of the <strong>Dive profile</strong> (top right-hand panel).</p></div>
-<div class="paragraph" id="cylinder_definitions"><p><strong>Cylinders</strong>: The cylinder information is entered through a dialogue that looks
-like this:</p></div>
-<div class="imageblock" style="text-align:center;">
-<div class="content">
-<img src="images/DC_gas-dialogue1_f20.jpg" alt="FIGURE: Initial cylinder dialogue" />
-</div>
-</div>
-<div class="paragraph"><p>For hand-entered dives, this information needs to be typed in. For dive
-computers, <em>Subsurface</em> often obtains the gas used from the dive computer
-and automatically inserts the gas composition(% oxygen or % helium) in the
-table. The + button at the top right allows the user to add more cylinders
-for this dive. The dark dustbin icon on the left allows the deletion of
-information for a cylinder.  Note that it is not possible to delete a
-cylinder if it is used during the dive. A cylinder might be implicitly used
-in the dive, even without a gas change event.</p></div>
-<div class="paragraph"><p>The user should start by selecting a cylinder type on the left-hand side of
-the table.  To select a cylinder, the <em>Type</em> box should be clicked. This
-brings up a list button that can be used to display a dropdown list of
-cylinders:</p></div>
-<div class="imageblock" style="text-align:center;">
-<div class="content">
-<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 for this dive or the user may start typing in the box which shows the
-available options for the entered characters. The <strong>Size</strong> of the cylinder as
-well as its working pressure (<em>Work.press</em>) will automatically be shown in
-the dialogue.</p></div>
-<div class="paragraph"><p>Next, indicate the starting pressure and the ending pressure of the
-specified gas during the dive. The unit of pressure (metric/imperial)
-corresponds to the settings chosen in the <em>Preferences</em>.</p></div>
-<div class="paragraph"><p>Finally, provide the gas mixture used. If air was used, the value of 21% can
-be entered or this field can be left blank. If nitrox or trimix were used,
-their percentages of oxygen and/or helium should be entered.  Any
-inappropriate fields should be left empty. After typing the information for
-the cylinder, save the data either by pressing <em>ENTER</em> on the keyboard or by
-clicking outside the cell containing the cursor. Information for any
-additional cylinders can be added by using the + 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_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
-using a dialogue very similar to that of the cylinder information. If one
-clicks
-the + button on the top right of the weights dialogue, the table looks like
-this:</p></div>
-<div class="imageblock" style="text-align:center;">
-<div class="content">
-<img src="images/WeightsDataEntry1_f20.jpg" alt="FIGURE:The Weights dialogue" />
-</div>
-</div>
-<div class="paragraph"><p>By clicking on the <em>Type</em> field, a drop-down list becomes accessible through
-a down-arrow:</p></div>
-<div class="imageblock" style="text-align:center;">
-<div class="content">
-<img src="images/WeightsDataEntry2_f20.jpg" alt="FIGURE:Weights type drop-down list button" />
-</div>
-</div>
-<div class="paragraph"><p>This can be used to select the type of weight system used during the dive or
-the user may start typing in the box to specify a different weighting
-mechanism that will be saved by <em>Subsurface</em>.  In the <strong>Weight</strong> field, type
-in the amount of weight used during the dive. After specifying the weight
-system, save the data by either pressing <em>ENTER</em> on the keyboard or by
-clicking outside the cell with the cursor.  It is possible to enter
-information for more than one weight system by adding an additional system
-using the + button on the top right hand. Weight systems can be deleted
-using the dustbin icon on the left hand. Here is an example of information
-for a dive with two types of weights: integrated as well as a weight belt:</p></div>
-<div class="imageblock" style="text-align:center;">
-<div class="content">
-<img src="images/WeightsDataEntry3_f20.jpg" alt="FIGURE: A completed weights information table" />
-</div>
-</div>
-</div>
-</div>
-<div class="sect3">
-<h4 id="_editing_several_selected_dives_simultaneously">5.2.5. Editing several selected dives simultaneously</h4>
-<div class="paragraph"><p><em>METHOD 1</em>: After uploading dives from a dive computer, the dive profiles of
-each uploaded dive is shown in the <strong>Dive profile</strong> tab, as well as a few
-items of information in the <strong>Notes</strong> tab (e.g. water temperature) and in the
-<strong>Equipment</strong> tab (e.g. gas pressures and gas composition). However the other
-fields remain empty.  It may be useful to simultaneously edit some of the
-fields in the <strong>Notes</strong> and <strong>Equipment</strong> tabs.  For instance, it is possible
-that a diver performed several dives during a single day, using identical
-equipment while diving at the same dive site or with the same dive master
-and/or buddy or tags. Instead of completing the information for each of
-these dives separately, one can select all the dives for that day in the
-<strong>Dive List</strong> and insert the same information in the <strong>Notes</strong> and <strong>Equipment</strong>
-fields that need identical information. This is achieved by editing the dive
-notes or the equipment for any one of the selected dives.</p></div>
-<div class="paragraph"><p>The simultaneous editing only works with fields that do not already contain
-information.  This means that, if some fields have been edited for a
-particular dive among the selected dives, these are not changed while
-editing the dives simultaneously. Technically, the rule for editing several
-dives simultaneously is: if the data field being edited contains <em>exactly
-the same information</em> for all the dives that have been selected, the new,
-edited information is substituted for all the selected dives, otherwise only
-the 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>Notes</strong> and
-<strong>Equipment</strong> tabs. Then, from the main menu, select <em>Log &#8594; Copy dive
-components</em>.  A box is presented with a selection of check boxes for most of
-the fields in the <strong>Notes</strong> and <strong>Equipment</strong> tabs.  Select the fields to be
-copied from the currently selected dive, then select <em>OK</em>. Now, in the <strong>Dive
-List</strong>, select the dives into which this information is to be pasted. Then,
-from the main menu, select <em>Log &#8594; Paste dive components</em>.  All the selected
-dives now contain the data initially selected in the original source dive
-log.</p></div>
-</div>
-<div class="sect3">
-<h4 id="_adding_bookmarks_to_a_dive">5.2.6. Adding Bookmarks to a dive</h4>
-<div class="paragraph"><p>Many divers wish to annotate their dives with text that indicate particular
-events during the dive, e.g. "Saw dolphins", or "Released surface
-buoy". This is easily done:</p></div>
-<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).
-</p>
-</li>
-<li>
-<p>
-Right-click on the red flag. This brings up the context menu (see <strong>B</strong>
-   below). Select <em>Edit name</em>.
-</p>
-</li>
-<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.
-</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).
-</p>
-</li>
-</ul></div>
-<div class="imageblock" style="text-align:center;">
-<div class="content">
-<img src="images/Bookmarks.jpg" alt="FIGURE: Bookmark dialog" />
-</div>
-</div>
-</div>
-<div class="sect3">
-<h4 id="_saving_the_updated_dive_information">5.2.7. Saving the updated dive information</h4>
-<div class="paragraph"><p>The information entered in the <strong>Notes</strong> tab and the <strong>Equipment</strong> tab can be
-saved by using the two buttons on the top right hand of the <strong>Notes</strong> tab. If
-the <em>Apply changes</em> button is clicked, the dive data are saved in the memory
-image of the dive. If the <em>Discard changes</em> button is clicked, then the
-newly entered dive data are erased from the computer memory, although the
-dive profile is retained. When the user exits <em>Subsurface</em> there is a final
-prompt to confirm that the new data should now be saved permanently on the
-computer disk.</p></div>
-</div>
-</div>
-<div class="sect2">
-<h3 id="_importer_les_informations_à_partir_d_8217_autres_sources_de_données_numériques_ou_d_8217_autres_formats_de_données">5.3. Importer les informations à partir d&#8217;autres sources de données numériques ou d&#8217;autres formats de données</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 imported into
-<em>Subsurface</em>. <em>Subsurface</em> will import dive logs from a range of other dive
-log software. While some software is supported natively, for others the user
-has to export the logbook(s) to an intermediate format so that they can then
-be imported by <em>Subsurface</em>.  Currently, <em>Subsurface</em> supports importing CSV
-log files from several sources.  APD LogViewer, XP5, Sensus and Seabear
-files are preconfigured, but because the import is flexible, users can
-configure their own imports.  Manually kept log files (e.g. a spreadsheet)
-can also be imported by configuring the CSV import.  <em>Subsurface</em> can also
-import UDDF and UDCF files used by some divelog software and some dive
-computers, like the Heinrichs &amp; Weikamp DR5. Finally, for some divelog
-software like Mares Dive Organiser it is currently suggested to import the
-logbooks first into a webservice like <em>divelogs.de</em> and then import 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 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 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. Below follows more specific information to achieve data import to
-<em>Subsurface</em>.</p></div>
-<div class="sect3">
-<h4 id="_using_the_universal_import_dialogue">5.3.1. Using the universal import dialogue</h4>
-<div class="paragraph" id="Unified_import"><p>Importing dives from other software is performed through a universal
-interface activated by selecting <em>Import</em> from the Main Menu, then clicking
-on <em>Import Log Files</em>. This brings up dialogue <strong>A</strong>, below.</p></div>
-<div class="imageblock" style="text-align:center;">
-<div class="content">
-<img src="images/Import1_f20.jpg" alt="FIGURE: Import dialogue: step 1" />
-</div>
-</div>
-<div class="paragraph"><p>Towards the bottom right is a dropdown selector with a default label of
-<em>Dive Log Files</em> which gives access to the different types of direct imports
-available, as in dialogue <strong>B</strong>, above. Currently these are:</p></div>
-<div class="ulist"><ul>
-<li>
-<p>
-XML-formatted dive logs (DivingLog 5.0, MacDive and several other dive log
-   systems)
-</p>
-</li>
-<li>
-<p>
-Cochran dive logs
-</p>
-</li>
-<li>
-<p>
-UDDF-formatted dive logs (e.g. Kenozoooid)
-</p>
-</li>
-<li>
-<p>
-UDCF-formatted dive logs
-</p>
-</li>
-<li>
-<p>
-Poseidon MkVI CCR logs
-</p>
-</li>
-<li>
-<p>
-APD Inspiration/Evolution CCR logs
-</p>
-</li>
-<li>
-<p>
-LiquiVision logs
-</p>
-</li>
-<li>
-<p>
-divelog.de logs
-</p>
-</li>
-<li>
-<p>
-OSTC Tools logs
-</p>
-</li>
-<li>
-<p>
-JDiveLog
-</p>
-</li>
-<li>
-<p>
-Suunto Dive Manager (DM3 and DM4)
-</p>
-</li>
-<li>
-<p>
-CSV (text-based and spreadsheet-based) dive logs, including APD CCR logs
-</p>
-</li>
-</ul></div>
-<div class="paragraph"><p>Selecting the appropriate format and then the specific log file in the large
-window containing the file list on the right of the dialogue opens the
-imported dive log in the <em>Subsurface</em> <strong>Dive List</strong>. Some other formats, not
-accessible through the Import dialogue are also supported, as explained
-below.</p></div>
-</div>
-<div class="sect3">
-<h4 id="_importing_from_ostctools">5.3.2. Importing from  OSTCTools</h4>
-<div class="paragraph"><p><em>OSTC Tools</em> is a Microsoft-based suite of dive download and dive management
-tools for the OSTC family of dive computers. <em>OSTC Tools</em> downloads dive
-data from the dive computer and stores it as a binary file with file
-extension <em>.dive</em> . Subsurface can directly import these files when using
-the universal import dialogue. From the dropdown list at the bottom right
-select <em>OSTCTools Files (.dive .DIVE)</em>. This makes the <em>OSTC Tools</em> dive
-logs visible in the file list panel. Select one or more dive, then click the
-<em>Open</em> button. The OSTC dives are shown in the <strong>Dive List</strong> panel.</p></div>
-<div class="paragraph"><p>Actually, all H&amp;W devices supported by OSTCTools can be imported to
-<em>Subsurface</em>, this includes OSTC, OSTC Mk2, OSTC 2N/2C, OSTC3, OSTC Sport,
-and probably although untested, Frog, OSTC2 and OSTC CR.</p></div>
-<div class="paragraph"><p>Please, remember that OSTCTools is <strong>not</strong> a true diving log software, but a
-useful set of tools for analysis and management of OSTC devices. This way,
-only raw dive computer data will be performed with the import to
-<em>Subsurface</em>; one has to to manually complete the rest of data which may be
-important (buddies, equipment, notes, etc).</p></div>
-</div>
-<div class="sect3">
-<h4 id="_importing_from_mares_dive_organiser_v2_1">5.3.3. Importing from Mares Dive Organiser V2.1</h4>
-<div class="paragraph"><p>Since Mares utilise proprietary Windows software not compatible with
-multi-platform applications, these dive logs cannot be directly imported
-into <em>Subsurface</em>. Mares dive logs need to be imported using a three-step
-process, using <em>www.divelogs.de</em> as a mechanism to extract the dive log
-information.</p></div>
-<div class="olist arabic"><ol class="arabic">
-<li>
-<p>
-Export the dive log data from Mares Dive Organiser to the user&#8217;s desktop,
-   using a <em>.sdf</em> file name extension. Refer to <a href="#Mares_Export">Appendix C</a>
-   for more information.
-</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>.
-</p>
-</li>
-<li>
-<p>
-Finally, import the dives 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">5.3.4. Importing dives from <strong>divelogs.de</strong></h4>
-<div class="paragraph"><p>The import of dive information from <em>divelogs.de</em> is simple, using a single
-dialogue box. The <em>Import &#8594; Import from Divelogs.de</em> option should be
-selected from the Main Menu. This brings up a dialogue box (see image <strong>A</strong>
-below). Enter a user-ID and password for <em>divelogs.de</em> into the appropriate
-fields and then select the <em>Download</em> button. Download from <em>divelogs.de</em>
-starts immediately, displaying a progress bar in the dialogue box. At the
-end of the download, the success status is indicated (see image <strong>B</strong>,
-below). The <em>Apply</em> button should then be selected, after which the imported
-dives appear in the <em>Subsurface</em> <strong>Dive List</strong> panel.</p></div>
-<div class="imageblock" style="text-align:center;">
-<div class="content">
-<img src="images/Divelogs1.jpg" alt="FIGURE:Download from Divelogs.de" />
-</div>
-</div>
-</div>
-<div class="sect3">
-<h4 id="S_ImportingCSVData">5.3.5. Importer des données au format CSV</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">Importer les plongées au format CSV à partir des ordinateurs de plongées ou d&#8217;autres logiciels de carnet de plongée</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>
-<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>
-<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>
-</li>
-</ol></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 field separator should be either a comma (,) a semicolon (;) or a
-   TAB character.  This can be determined by opening the file with a text
-   editor. If it is comma-delimited or semicolon-delimited, the comma or
-   semicolon characters between the values are clearly visible. If these are
-   not evident and the numbers are aligned in columns, the file is probably
-   TAB-delimited (i.e. it uses a TAB as a field separator).
-</p>
-</li>
-<li>
-<p>
-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>
-Is the numeric information (e.g. dive depth) in metric or in imperial units?
-</p>
-</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> (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 blue row of the data table contains the
-column headings found in the <em>CSV</em> data file. The blue row of balloons
-immediately above these contains the names understood by <em>Subsurface</em>. These
-balloons can be moved using a drag-and-drop action. For instance,
-<em>Subsurface</em> expects the column heading for Dive number (" # ") to be "Dive
-# ". If the column heading that <em>Subsurface</em> expects is not in the blue row,
-then drag the appropriate balloon from the upper area and drop it in the
-appropriate blue cell at the top of the table. To indicate the correct
-column for "Dive #", drag the ballooned item 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/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 of the dialogue.  The data from the <em>CSV</em> file are imported and shown
-in the <strong>Dive List</strong> panel.</p></div>
-<div class="sidebarblock" id="S_CSV_Intro">
-<div class="content">
-<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
-Values</em>. It is a file format allowing someone to view or edit the
-information using a text editor such as Notepad (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>The above data are not easily read by a human. Here is the same information
-in TAB-delimited format:</p></div>
-<div class="literalblock">
-<div class="content">
-<pre><code>Dive site       Dive date       Time    Dive_duration   Dive_depth      Dive buddy
-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 the limits of the parser
-used. When encountering problems with <em>CSV</em> imports, first try with a
-smaller file to make sure everything works.</td>
-</tr></table>
-</div>
-</div>
-</div>
-</div>
-<div class="sect2">
-<h3 id="S_Companion">5.4. Importing GPS coordinates with the <em>Subsurface Companion App</em> for mobile phones</h3>
-<div class="paragraph"><p>Using the <strong>Subsurface Companion App</strong> on an <em>Android device</em>   or
-<a href="#S_iphone"><em>iPhone</em></a> with GPS, the coordinates
-for the diving
-location can be automatically passed to the <em>Subsurface</em>
-dive log. The Companion App stores the dive locations on
-a dedicated Internet file server. <em>Subsurface</em>, in turn, can collect
-the localities from the file server.</p></div>
-<div class="paragraph"><p>To do this:</p></div>
-<div class="sect3">
-<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.
-</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>.
-</p>
-</li>
-</ul></div>
-</div>
-<div class="sect3">
-<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.
-</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.
-</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).
-</p>
-</li>
-</ul></div>
-<div class="admonitionblock">
-<table><tr>
-<td class="icon">
-<img src="images/icons/important.png" alt="Important" />
-</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 in <em>Subsurface</em> itself.  This facilitates
-synchronisation between <em>Subsurface</em> and the Companion App.</td>
-</tr></table>
-</div>
-<div class="sect4">
-<h5 id="_creating_new_dive_locations">Creating new dive locations</h5>
-<div class="paragraph"><p>Now one is ready to get a dive position and send it to the server. The
-Android display will look like the left hand image (<strong>A</strong>) below, but without
-any dives.</p></div>
-<div class="paragraph"><p>Touch the "+" icon on the top right to add a new dive site, a menu will be
-showed with 3 options:</p></div>
-<div class="ulist"><ul>
-<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.
-</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.
-</p>
-</li>
-</ul></div>
-<div class="imageblock" style="text-align:center;">
-<div class="content">
-<img src="images/Companion_5.jpg" alt="FIGURE: Companion App, add location using map" />
-</div>
-</div>
-<div class="ulist"><ul>
-<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.
-</p>
-</li>
-</ul></div>
-</div>
-<div class="sect4">
-<h5 id="_dive_lists_of_dive_locations">Dive lists of dive locations</h5>
-<div class="paragraph"><p>The main screen shows a list of dive locations, each with a name, date and
-time (see <strong>A</strong> below). Some locations may have an arrow-up icon over the
-selection box to the left indicating that they require upload to the
-server. One can select individual dive locations from the list. A selected
-location has a check mark in the selection box on the left. Group operations
-(such as <em>Delete</em> or <em>Send</em>)  are performed on several locations that are
-selected.</p></div>
-<div class="paragraph"><p>Dive locations in this list can be viewed in two ways: a list of locations
-or a map indicating the dive locations. The display mode (List or Map) is
-changed by selecting <em>Dives</em> at the top left of the screen (see <strong>A</strong> below)
-and then selecting the display mode. The display mode can be changed either
-from the list of locations or from the map (see <strong>B</strong> below). If one selects a
-location (on the list or on the map), an editing panel opens (see <strong>C</strong> below)
-where the dive description or other details may be changed.</p></div>
-<div class="imageblock" style="text-align:center;">
-<div class="content">
-<img src="images/Companion_4.jpg" alt="FIGURE: Companion App, add location using map" />
-</div>
-</div>
-<div class="paragraph"><p>When one selects a dive (<strong>not</strong> selecting the check box), the name given to
-it, date/time and GPS coordinates will be shown, with two options at the top
-of the screen:</p></div>
-<div class="ulist"><ul>
-<li>
-<p>
-Edit (pencil): Change the text name or other characteristics of the dive
-  location.
-</p>
-</li>
-<li>
-<p>
-Maps: Display a map showing the dive location.
-</p>
-</li>
-</ul></div>
-<div class="paragraph"><p>After editing and saving a dive location (see <strong>C</strong> above), one needs to
-upload it to the web service, as explained below.</p></div>
-</div>
-<div class="sect4">
-<h5 id="_uploading_dive_locations">Uploading dive locations</h5>
-<div class="paragraph"><p>There are several ways to send locations to the server.  The easiest is by
-simply selecting the locations (See <strong>A</strong> below) and then touching the right
-arrow at the top right of the screen.</p></div>
-<div class="admonitionblock">
-<table><tr>
-<td class="icon">
-<img src="images/icons/important.png" alt="Important" />
-</td>
-<td class="content">Users must be careful, as the trash icon on the right means exactly what it
-should; it deletes the selected dive location(s).</td>
-</tr></table>
-</div>
-<div class="imageblock" style="text-align:center;">
-<div class="content">
-<img src="images/Companion_1.jpg" alt="FIGURE: Screen shots (A-B) of companion app" />
-</div>
-</div>
-<div class="paragraph"><p>After a dive trip using the Companion App, all dive locations are ready to
-be downloaded to a <em>Subsurface</em> dive log (see below).</p></div>
-</div>
-<div class="sect4">
-<h5 id="_settings_on_the_companion_app">Settings on the Companion App</h5>
-<div class="paragraph"><p>Selecting the <em>Settings</em> menu option results in the right hand image above
-(<strong>B</strong>).</p></div>
-</div>
-<div class="sect4">
-<h5 id="_server_and_account">Server and account</h5>
-<div class="ulist"><ul>
-<li>
-<p>
-<em>Web-service URL.</em> This is predefined (<a href="http://api.hohndel.org/">http://api.hohndel.org/</a>)
-</p>
-</li>
-<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.
-</p>
-</li>
-</ul></div>
-</div>
-<div class="sect4">
-<h5 id="_synchronisation">Synchronisation</h5>
-<div class="ulist"><ul>
-<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.
-</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.
-</p>
-</li>
-</ul></div>
-</div>
-<div class="sect4">
-<h5 id="_background_service">Background service</h5>
-<div class="paragraph"><p>Instead of entering a unique dive location, users can leave the service
-running in the background of their Android device, allowing the continuous
-collection of GPS locations.</p></div>
-<div class="paragraph"><p>The settings below define the behaviour of the service:</p></div>
-<div class="ulist"><ul>
-<li>
-<p>
-<em>Min duration.</em> In minutes. The app will try to get a location every X
-  minutes until stopped by the user.
-</p>
-</li>
-<li>
-<p>
-<em>Min distance.</em> In meters. Minimum distance between two locations.
-</p>
-</li>
-<li>
-<p>
-<em>Name template.</em> The name the app will use when saving the locations.
-</p>
-</li>
-</ul></div>
-<div class="admonitionblock">
-<table><tr>
-<td class="icon">
-<img src="images/icons/info.jpg" alt="Tip" />
-</td>
-<td class="content"><em>How does the background service work?</em> Assuming the user sets 5 minutes and
-50 meters in the settings above, the app will start by recording a location
-at the current location, followed by another one at every 5 minutes <strong>or</strong>
-every time one moves 50 m from previous location.  If subsequent locations
-are within a radius of 50 meters from the previous one, a new location is
-not saved. If the user is not moving, only one location is saved, but if the
-user is moving, a trace of the route is obtained by saving a location every
-50 meters.</td>
-</tr></table>
-</div>
-</div>
-<div class="sect4">
-<h5 id="_other">Other</h5>
-<div class="paragraph"><p><em>Mailing List.</em> The mail box for <em>Subsurface</em>. Users can send an email to
-the Subsurface mailing list.</p></div>
-<div class="ulist"><ul>
-<li>
-<p>
-<em>Subsurface website.</em> A link to the URL of Subsurface web
-</p>
-</li>
-<li>
-<p>
-<em>Version.</em> Displays the current version of the Companion App.
-</p>
-</li>
-</ul></div>
-</div>
-<div class="sect4">
-<h5 id="_search">Search</h5>
-<div class="paragraph"><p>Search the saved dive locations by name or by date and time.</p></div>
-</div>
-<div class="sect4">
-<h5 id="_start_service">Start service</h5>
-<div class="paragraph"><p>Initiates the <em>background service</em> following the previously defined
-settings.</p></div>
-</div>
-<div class="sect4">
-<h5 id="_disconnect">Disconnect</h5>
-<div class="paragraph"><p>This is a badly named option that disconnects the app from the server by
-resetting the user ID in the app, showing the first screen where an account
-can be created, retrieve the ID for an existing account or use the users own
-ID. The disconnect option is useful if a user&#8217;s Android device was used to
-download the dive locations of another registered diver.</p></div>
-</div>
-<div class="sect4">
-<h5 id="_send_all_locations">Send all locations</h5>
-<div class="paragraph"><p>This option sends all locations stored in the Android device to the server.</p></div>
-</div>
-</div>
-<div class="sect3">
-<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 &#8594; Import GPS data from Subsurface Service</em>, resulting in the
-image on the left (<strong>A</strong>), below. On first use the DIVERID text box is
-blank. Provide a DIVERID, then select the <em>Download</em> button to initiate the
-download process, after which the screen on the right (<strong>B</strong>) below appears:</p></div>
-<div class="imageblock" style="text-align:center;">
-<div class="content">
-<img src="images/DownloadGPS.jpg" alt="FIGURE: Downloading Companion app GPS data" />
-</div>
-</div>
-<div class="paragraph"><p>Note that the <em>Apply</em> button is now active. By clicking on it, users can
-update the locations of the newly entered or uploaded dives in <em>Subsurface</em>
-which applies the coordinates and names entered on the app for all the new
-dives that match the date-times of the uploaded GPS localities. If one has
-entered the name of the dive location in <em>Subsurface</em> before downloading the
-GPS coordinates, this name will take precedence over downloaded one.</p></div>
-<div class="paragraph"><p>Since <em>Subsurface</em> matches GPS locations from the Android device and dive
-information from the dive computer based on date-time data, automatic
-assignment of GPS data to dives is dependent on agreement of the date-time
-information between these two devices. Although <em>Subsurface</em> has a wide
-range tolerance, it may be unable to identify the appropriate dive if there
-is a large difference between the time in the dive computer and that of the
-Android device, resulting in no updates.</p></div>
-<div class="paragraph"><p>Similar date-times may not always be possible and there may be many reasons
-for this (e.g. time zones), or <em>Subsurface</em> may be unable to decide which is
-the correct position for a dive (e.g. on repetitive dives while running
-<em>background service</em> there may be several locations that would be included
-in the time range that fit not only the first dive, but one or more
-subsequent dives as well).  A workaround for this situation to manually edit
-the date-time of a dive in the <em>Subsurface</em> Dive List <strong>before</strong> downloading
-the GPS data and then to change the date-time back again <strong>after</strong> downloading
-GPS data.</p></div>
-<div class="admonitionblock">
-<table><tr>
-<td class="icon">
-<img src="images/icons/info.jpg" alt="Note" />
-</td>
-<td class="content">TIPS:</td>
-</tr></table>
-</div>
-<div class="ulist"><ul>
-<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).
-</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.
-</p>
-</li>
-</ul></div>
-</div>
-</div>
-<div class="sect2">
-<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">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_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_f20.jpg" alt="FIGURE: Load images option" />
-</div>
-</div>
-<div class="paragraph"><p>This brings up the time synchronisation dialog, shown below. The critical
-problem is that the time synchronisation is not perfect between the dive
-computer used during a dive, and the camera used during that same
-dive. These two devices often differ by several minutes. If <em>Subsurface</em> can
-achieve synchronisation, then the exact times of photographs can be used to
-position photographs on the dive profile.</p></div>
-<div class="paragraph"><p><em>Subsurface</em> achieves this synchronisation in three ways:</p></div>
-<div class="ulist"><ul>
-<li>
-<p>
-<strong>Pro-actively</strong>: Before the dive, ensure synchronisation of the dive computer time settings with
-  the time settings of the camera by changing the date-time settings on one or both of these devices.
-</p>
-</li>
-<li>
-<p>
-<strong>Manually</strong>: If the user wrote down the exact camera time at the start of a dive, the
-  difference in time between the two devices can be determined. Actually, as long as the device
-  settings for time has not been changed in either device, one could write down the times of
-  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_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 <em>Time shift</em> dialog. If one uses
-  the bottom part, the top part of the dialog is ignored. Click on
-  the horizontal bar entitled "<em>Select image of dive computer showing time</em>. This brings up
-  a file browser with which one can select the photograph of the dive computer time. Select the
-  photograph using the file browser and click on <em>OK</em>. This photograph of the dive computer
-  appears in the bottom panel of the <em>Shift times</em> dialog. Now <em>Subsurface</em> knows exactly
-  when the photograph has been taken. Now set the date-time dialog to the left of the photo
-  so that this tool reflects the date and time of the dive computer in the photo. When the
-  date-time tool has been set, <em>Subsurface</em> knows exactly what the time difference between
-  camera and dive computer is, and synchronisation is achieved.
-  Image <strong>B</strong> above shows a photograph of the face of the dive computer and with the date-time tool set to the
-  date-time.
-</p>
-</li>
-</ul></div>
-<div class="paragraph"><p>If the timestamp of a photograph is more than 30 minutes before or after the
-dive, it is not placed on the dive profile.</p></div>
-</div>
-<div class="sect3">
-<h4 id="_viewing_the_photos">5.5.2. Viewing the photos</h4>
-<div class="paragraph"><p>After the images have been loaded, they appear in two places:</p></div>
-<div class="ulist"><ul>
-<li>
-<p>
-the <em>Photos</em> tab of the <strong>Notes</strong> panel.
-</p>
-</li>
-<li>
-<p>
-as tiny icons (stubs) on the dive profile at the appropriate positions
-   reflecting the time each photograph was taken.  In order to view the photos
-   on the dive profile, activate the <em>show-photos</em> button in the tool bar to
-   the left of the dive profile:
-</p>
-</li>
-</ul></div>
-<div class="imageblock" style="text-align:left;">
-<div class="content">
-<img src="images/icons/ShowPhotos_f20.png" alt="FIGURE:Show photos toolbar button" />
-</div>
-</div>
-<div class="paragraph"><p>This results in a profile display as in the image below:</p></div>
-<div class="imageblock" style="text-align:center;">
-<div class="content">
-<img src="images/LoadImage4_f20.jpg" alt="FIGURE: Photos on dive profile" />
-</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_f20.jpg" alt="FIGURE:Thumbnail photo on dive profile" />
-</div>
-</div>
-<div class="paragraph"><p>Clicking on the thumbnail brings up a full size photo overlaid on the
-<em>Subsurface</em> window. This allows good viewing of the photographs that have
-been added (see the image below). Note that the thumbnail has a small
-dustbin icon in the bottom right hand corner (see image above). If one
-selects the dustbin, the image is removed from the dive. Therefore some care
-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_f20.jpg" alt="FIGURE: Full-screen photo on dive profile" />
-</div>
-</div>
-</div>
-<div class="sect3">
-<h4 id="_the_em_photos_em_tab">5.5.3. The <em>Photos</em> tab</h4>
-<div class="paragraph"><p>Photographs associated with a dive are shown as thumbnails in the <em>Photos</em>
-tab of the <em>Notes</em> panel. Photos taken in rapid succession during a dive
-(therefore sometimes with large overlap on the dive profile) can easily be
-accessed in the <em>Photos</em> tab. This tab serves as a tool for individually
-accessing the photos of a dive, while the stubs on the dive profile give an
-indication of when during a dive a photo was taken. By single-clicking on a
-thumbnail in the <em>Photos</em> panel, a photo is selected. By double-clicking a
-thumbnail, the full-sized image is shown, overlaying the <em>Subsurface</em>
-window. A photo can be deleted from the <em>Photos</em> panel by selecting it
-(single-click) and then by pressing the <em>Del</em> key on the keyboard. This
-removes the photo both from the <em>Photos</em> tab as well as the dive profile.</p></div>
-</div>
-<div class="sect3">
-<h4 id="_photos_on_an_external_hard_disk">5.5.4. Photos on an external hard disk</h4>
-<div class="paragraph"><p>Most underwater photographers store their photos on an external drive. If
-such a drive can be mapped by the operating system (almost always the case)
-the photos can be directly accessed by <em>Subsurface</em>. This facilitates the
-interaction between <em>Subsurface</em> and an external repository of photos. When
-associating a dive profile with photos from an external drive, the normal
-procedure of selection and synchronisation (see text above) is used.
-However, after the external drive has been disconnected, <em>Subsurface</em> cannot
-access these photos any more.  If the display of photos is activated (using
-the toolbox to the left of the <em>Dive Profile</em>), the program only shows a
-small white dot where each photo should be on the dive profile.  In addition
-the <em>Photos</em> tab only shows the file names of the photos. This is normal
-behaviour.  If, later, the external drive with the photos is connected
-again, the photos can be seen in the normal way.</p></div>
-</div>
-<div class="sect3">
-<h4 id="S_FindMovedImages">5.5.5. Moving photographs among directories, hard disks or computers</h4>
-<div class="paragraph"><p>After a photograph has been loaded into <em>Subsurface</em> and associated with a specific dive, the directory
- where the photo lies is stored, allowing <em>Subsurface</em> to find the photograph when the dive is
- opened again. If the photo or the whole photo collection is moved to another drive or to a different
- machine, it is unlikely that the directory structure will remain identical to that of the original uploaded
- photo. When this happens, <em>Subsurface</em> looks for the photos at their original location before they were moved,
- cannot find them and therefore cannot display them. Because, after moving photos, large numbers of photos
- may need to be deleted and re-imported from the new location, <em>Subsurface</em> has a mechanism that eases the
- process of updating the directory information for each photo: automatic updates using fingerprints.</p></div>
-<div class="paragraph"><p>When a photo is loaded into <em>Subsurface</em>, a fingerprint for the image is calculated and stored with the
- other reference information for that photo. After moving a photo collection (that has already been loaded
- into <em>Subsurface</em>) to a different directory, disk or computer, <em>Subsurface</em> can  perform the
- following steps:</p></div>
-<div class="ulist"><ul>
-<li>
-<p>
-look through a particular directory (and all its subdirectories recursively)
-  where photos have been moved
- to,
-</p>
-</li>
-<li>
-<p>
-calculate fingerprints for all photos in this directory, and
-</p>
-</li>
-<li>
-<p>
-if there is a match between a calculated fingerprint and the one originally
-  calculated when a photo was
- loaded into <em>Subsurface</em> (even if the original file name has changed), to
- automatically update the directory information so that <em>Subsurface</em> can find
- the photo in the new moved directory.
-</p>
-</li>
-</ul></div>
-<div class="paragraph"><p>This is achieved by selecting from the Main Menu: <em>File &#8594;      Find moved images</em>. This brings up a window within
- which the NEW directory of the photos needs to be specified. Select the appropriate directory and click
- the <em>Scan</em> button towards the bottom right of the panel. The process may require several minutes to
- complete, after which <em>Subsurface</em> will show the appropriate photographs when a particular dive is opened.</p></div>
-<div class="sidebarblock" id="Image_fingerprint_upgrade">
-<div class="content">
-<div class="paragraph"><p><strong>Upgrading existing photo collections without fingerprints</strong></p></div>
-<div class="admonitionblock">
-<table><tr>
-<td class="icon">
-<img src="images/icons/important.png" alt="Important" />
-</td>
-<td class="content"><em>Subsurface</em> automatically calculates fingerprints for all images that can
-be accessed by <em>Subsurface</em>.  When manipulating images, ensure that all the
-images associated with the dive log can be accessed by <em>Subsurface</em>.</td>
-</tr></table>
-</div>
-<div class="paragraph"><p><em>Subsurface</em> automatically checks and, if necessary, updates the
-fingerprints associated with a single dive if:
-- The images associated with that dive are visible as thumbnails on the <strong>Dive
-  Profile</strong>.
-- One edits anything in the <strong>Notes tab</strong> panel and save the edits by selecting
-  <em>Apply changes</em>.</p></div>
-</div></div>
-</div>
-</div>
-<div class="sect2">
-<h3 id="_logging_special_types_of_dives">5.6. Logging special types of dives</h3>
-<div class="sect3">
-<h4 id="S_MulticylinderDives">5.6.1. Multicylinder dives</h4>
-<div class="paragraph"><p><em>Subsurface</em> easily handles dives involving more than one
-cylinder. Multi-cylinder diving usually happens (a) if a diver does not have
-enough gas for the complete dive in a single cylinder; (b) if the diver
-needs more than one gas mixture because of the depth or the decompression
-needs of the dive. For this reason multi-cylinder dives are often used by
-technical divers who dive deep or long. As far as <em>Subsurface</em> is concerned,
-there are only two types of information that need to be provided:</p></div>
-<div class="ulist"><ul>
-<li>
-<p>
-<strong>Describe the cylinders used during the dive</strong> This is performed in the <strong>Equipment tab</strong> of
-  the <strong>Info</strong> panel, as <a href="#cylinder_definitions">described above</a>. Enter the cylinders one by one,
-  specifying the characteristics of the cylinder and the gas composition within each cylinder.
-</p>
-</li>
-<li>
-<p>
-<strong>Record the times at which switches from one cylinder to another was done:</strong> This is information
-  provided by some dive computers (provided the diver indicated these changes to the dive computer
-  by pressing specific buttons). If the dive computer does not provide the information, the diver has to
-  record these changes using a different method, e.g. writing it on a slate.
-</p>
-</li>
-<li>
-<p>
-<strong>Record the cylinder changes on the dive profile</strong>: If the latter option
-  was followed, the diver needs to indicate the gas change event by right-clicking at the appropriate point
-  in time on the <strong>Dive Profile</strong> panel and indicating the cylinder to which the change was made. After
-  right-clicking, follow the context menu to "Add gas change" and select the appropriate cylinder from
-  those defined during the first step, above (see image below). If the
-  <strong>tank bar</strong> button in the toolbar has been activated, the cylinder switches are also indicated in the
-  tank bar.
-</p>
-</li>
-</ul></div>
-<div class="paragraph"><p>Having performed these tasks, <em>Subsurface</em> indicates the appropriate use of
-cylinders in the dive profile.  Below is a multi-cylinder dive, starting off
-with EAN28, then changing cylinders to EAN50 after 26 minutes to perform
-decompression.</p></div>
-<div class="imageblock" style="text-align:center;">
-<div class="content">
-<img src="images/multicylinder_dive.jpg" alt="FIGURE: Multicylinder profile" />
-</div>
-</div>
-</div>
-<div class="sect3">
-<h4 id="_sidemount_dives">5.6.2. Sidemount dives</h4>
-<div class="paragraph"><p>Sidemount diving is just another form of multi-cylinder diving, often with
-both or all cylinders having the same gas mixture. Although it is a popular
-configuration for cave divers, sidemount diving can be performed by
-recreational divers who have completed the appropriate training. Sidemount
-dive logging involves, exactly as with multi-cylinder dives, above, three
-steps:</p></div>
-<div class="ulist"><ul>
-<li>
-<p>
-<strong>During the dive, record cylinder switch events</strong>. Since sidemount diving normally involves two
-  cylinders with air or with the same gas mixture, <em>Subsurface</em> distinguishes among these different
-  cylinders. In contrast, many dive computers that allow gas switching only distinguish among different
-  <em>gases</em> used, not among different <em>cylinders</em> used. This means that when sidemount dives are downloaded
-  from these dive computers, the events of switching between cylinders with the same gas are not downloaded. This may mean
-  that one may have to keep a written log of cylinder switch times using a slate, or (if the dive computer
-  has this facility) marking each cylinder switch with a bookmark that can be retrieved later. Returning
-  from a dive with the times of cylinder changes is the only tricky part of logging sidemount dives.
-</p>
-</li>
-<li>
-<p>
-<strong>Within <em>Subsurface</em> describe the cylinders used during the dive</strong>. The diver needs to provide the
-  specifications of the different cylinders, using the <strong>Equipment</strong> tab of the <strong>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 in the 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 dive
-logging tool.</p></div>
-</div>
-<div class="sect3">
-<h4 id="S_sSCR_dives">5.6.3. Semi-closed circuit rebreather (SCR) dives</h4>
-<div class="admonitionblock">
-<table><tr>
-<td class="icon">
-<img src="images/halcyon_RB80.jpg" alt="Note" />
-</td>
-<td class="content">Passive semi-closed rebreathers (pSCR) comprise a technical advance in
-diving equipment that recirculates the breathing gas that a diver breathes,
-while removing carbon dioxide from the exhaled gas. While a small amount
-(typically a tenth) of the exhaled breathing gas is released into the water,
-a small amount of fresh gas is released from the back gas cylinder
-(typically containing nitrox).  A diver, using a single cylinder of
-breathing gas can therefore dive for much longer periods than using a
-recreational open-circuit configuration. With pSCR equipment, a very small
-amount of breathing gas is released every time the breather inhales. With
-active SCR (aSCR) equipment, in contrast, a small amount of breathing gas is
-released continuously from the back cylinder.</td>
-</tr></table>
-</div>
-<div class="paragraph"><p>To log pSCR dives, no special procedures are required, just the normal steps
-outlined above:</p></div>
-<div class="ulist"><ul>
-<li>
-<p>
-Select pSCR in the <em>Dive Mode</em> dropdown list on the <strong>Info</strong> panel.
-</p>
-</li>
-<li>
-<p>
-pSCR diving often involves gas changes, requiring an additional cylinder.
-  Define all the appropriate cylinders as described above and indicate the
-  cylinder/gas changes as described above in the section on
-  <a href="#S_MulticylinderDives">multicylinder dives</a>.
-</p>
-</li>
-</ul></div>
-<div class="paragraph"><p>If a pSCR <em>Dive Mode</em> has been selected, the dive ceiling for pSCR dives is
-adjusted for the oxygen drop across the mouthpiece which often requires
-longer decompression periods. Below is a dive profile of a pSCR dive using
-EAN36 on the back cylinder and oxygen for decompression. Note that this dive
-lasted over two hours.</p></div>
-<div class="imageblock" style="text-align:center;">
-<div class="content">
-<img src="images/pSCR_profile.jpg" alt="FIGURE: pSCR profile" />
-</div>
-</div>
-</div>
-<div class="sect3">
-<h4 id="S_CCR_dives">5.6.4. 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
-regulate the oxygen concentration to remain within safe diving limits.  The
-CCR interface of <em>Subsurface</em> is currently experimental and under active
-development. Subsurface currently supports Poseidon MkVI and APD
-Discovery/Evolution dive computers. In contrast to a conventional
-recreational dive computer, a CCR system computer does not allow the
-download of a log containing multiple dives. Rather, each dive is stored
-independently. This means that <em>Subsurface</em> cannot download a dive log
-directly from a CCR dive computer, but that it imports CCR dive logs in the
-same way that it imports dive log data from other digital databases: one
-dive at a time.</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 (labled <em>Filter:</em>) of appropriate devices that currently
-includes(Poseidon) MkVI or APD log viewer files (import for other CCR
-equipment is under active development). Having selected the appropriate CCR
-format and the directory where the original dive logs have been stored from
-the CCR dive computer, one can select a particular dive log file (in the
-case of the MkVI it is a file with a .txt extension). After selecting the
-appropriate dive log, activate the <em>Open</em> button at the bottom right hand of
-the universal import dialogue.  The selected dive is imported to the
-<em>Subsurface</em> dive list.</p></div>
-</div>
-<div class="sect4">
-<h5 id="_displayed_information_for_a_ccr_dive">Displayed information for a CCR dive</h5>
-<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 are 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 is shown in the image below,
-representing two checkboxes that modify the display of pO<sub>2</sub> when the
-appropriate toolbar button on the Dive Profile has been activated.</p></div>
-<div class="imageblock" style="text-align:center;">
-<div class="content">
-<img src="images/CCR_preferences_f20.jpg" alt="FIGURE: CCR preferences panel" />
-</div>
-</div>
-<div class="paragraph"><p>Checking any of these check boxes allows the display of additional
-oxygen-related information whenever the pO<sub>2</sub> toolbar button on the
-<em>Profile</em> panel is activated.  The first checkbox allows the display of
-setpoint information. This is a red line superimposed on the green oxygen
-partial pressure graph and allows a comparison of the mean measured oxygen
-partial pressure and the setpoint values, as shown below.</p></div>
-<div class="imageblock" style="text-align:center;">
-<div class="content">
-<img src="images/CCR_setpoint_f20.jpg" alt="FIGURE: CCR setpoint and po2 graph" />
-</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 overlay 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_f22.jpg" alt="FIGURE: CCR dive profile" />
-</div>
-</div>
-<div class="paragraph"><p><em>Equipment-specific information</em>: Equipment-specific information gathered by
-<em>Subsurface</em> is shown in the <a href="#S_ExtraDataTab">Extra data tab</a>. This may
-include setup information or metadata about the dive.</p></div>
-<div class="paragraph"><p>The deco ceiling calculated by Subsurface is not very accurate because the
-precise pressure of nitrogen in the loop can usually not be determined from
-the dive log imported from the CCR equipment. Many CCR dive computers,
-however, report an internally-calculated deco ceiling that is reported in
-the dive log, reflecting a more accurate assessment. The display of this
-ceiling is activated by clicking the appropriate button to the left of the
-dive profile:</p></div>
-<div class="imageblock">
-<div class="content">
-<img src="images/icons/cceiling.jpg" alt="DC ceiling icon" />
-</div>
-</div>
-<div class="paragraph"><p>The default colour of the computer-generated deco ceiling is white. However,
-this can be set to red by checking the appropriate check box after selecting
-<em>File &#8594; Preferences &#8594; Graph</em>.  Below is a dive profile indicating the dive
-computer-generated deco ceiling:</p></div>
-<div class="imageblock" style="text-align:center;">
-<div class="content">
-<img src="images/CCR_dive_ceilingF22.jpg" alt="FIGURE: CCR computer-generated deco ceiling" />
-</div>
-</div>
-<div class="paragraph"><p>More equipment-specific information for downloading CCR dive logs for
-Poseidon MkVI and APD equipment can be found in
-<a href="#_appendix_b_dive_computer_specific_information_for_importing_dive_information">Appendix
-B</a>.</p></div>
-</div>
-</div>
-</div>
-</div>
-</div>
-<div class="sect1">
-<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_info_strong_tab_for_individual_dives">6.1. The <strong>Info</strong> tab (for individual dives)</h3>
-<div class="paragraph"><p>The Info tab gives some summary information about a particular dive that has
-been selected in the <strong>Dive List</strong>. Useful information here includes the
-surface interval before the dive, the maximum and mean depths of the dive,
-the gas volume consumed, the surface air consumption (SAC) and the number of
-oxygen toxicity units (OTU) incurred.</p></div>
-<div class="admonitionblock">
-<table><tr>
-<td class="icon">
-<img src="images/icons/info.jpg" alt="Note" />
-</td>
-<td class="content">Gas consumption and SAC calculations: <em>Subsurface</em> calculates SAC and Gas
-consumption taking in account gas incompressibility, particularly at tank
-pressures above 200 bar, making them more accurate.  Users should refer to
-<a href="#SAC_CALCULATION">Appendix D</a> for more information.</td>
-</tr></table>
-</div>
-</div>
-<div class="sect2">
-<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 dive has been selected,
-figures pertaining to only that dive are given. This tab shows the number of
-dives selected, the total amount of dive time in these dives, as well as the
-minimum, maximum and mean for the dive duration, water temperature and
-surface air consumption (SAC). It also shows the depth of the shallowest and
-deepest dives of those selected.</p></div>
-</div>
-<div class="sect2">
-<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" />
-</div>
-</div>
-<div class="paragraph"><p>Of all the panels in <em>Subsurface</em>, the Dive Profile contains the most
-detailed information about each dive. The Dive Profile has a <strong>button bar</strong> on
-the left hand side that allows control over several display options. The
-functions of these buttons are described below. The main item in the Dive
-Profile is the graph of dive depth as a function of time. In addition to the
-obvious information of the depth it also shows the ascent and descent rates
-compared to the recommended speed of going up or down in the water
-column. This information is given using different colours:</p></div>
-<div class="tableblock">
-<table rules="all"
-width="100%"
-frame="border"
-cellspacing="0" cellpadding="4">
-<col width="33%" />
-<col width="33%" />
-<col width="33%" />
-<tbody>
-<tr>
-<td align="left" valign="top"><p class="table"><strong>Couleur</strong></p></td>
-<td align="left" valign="top"><p class="table"><strong>Vitesse de descente (m/min)</strong></p></td>
-<td align="left" valign="top"><p class="table"><strong>Vitesse de remontée (m/min)</strong></p></td>
-</tr>
-<tr>
-<td align="left" valign="top"><p class="table">Rouge</p></td>
-<td align="left" valign="top"><p class="table">&gt; 30</p></td>
-<td align="left" valign="top"><p class="table">&gt; 18</p></td>
-</tr>
-<tr>
-<td align="left" valign="top"><p class="table">Orange</p></td>
-<td align="left" valign="top"><p class="table">18 - 30</p></td>
-<td align="left" valign="top"><p class="table">9 - 18</p></td>
-</tr>
-<tr>
-<td align="left" valign="top"><p class="table">Jaune</p></td>
-<td align="left" valign="top"><p class="table">9 - 18</p></td>
-<td align="left" valign="top"><p class="table">4 - 9</p></td>
-</tr>
-<tr>
-<td align="left" valign="top"><p class="table">Vert clair</p></td>
-<td align="left" valign="top"><p class="table">1.5 - 9</p></td>
-<td align="left" valign="top"><p class="table">1.5 - 4</p></td>
-</tr>
-<tr>
-<td align="left" valign="top"><p class="table">Vert foncé</p></td>
-<td align="left" valign="top"><p class="table">&lt; 1.5</p></td>
-<td align="left" valign="top"><p class="table">&lt; 1.5</p></td>
-</tr>
-</tbody>
-</table>
-</div>
-<div class="paragraph"><p>The profile also includes depth readings for the peaks and troughs in the
-graph.  Thus, users should see the depth of the deepest point and other
-peaks. Mean depth is plotted as a grey line, indicating mean dive depth up
-to a particular moment during the dive.</p></div>
-<div class="admonitionblock">
-<table><tr>
-<td class="icon">
-<img src="images/icons/scale.jpg" alt="Note" />
-</td>
-<td class="content">In some cases the dive profile does not fill the whole area of the <strong>Dive
-Profile</strong> panel. Clicking the <strong>Scale</strong> button in the toolbar on the left of
-the dive profile frequently increases the size of the dive profile to fill
-the area of the panel efficiently.</td>
-</tr></table>
-</div>
-<div class="paragraph"><p><strong>Water temperature</strong> is displayed with its own blue line with temperature values
-placed adjacent to significant changes.</p></div>
-<div class="paragraph"><p>The dive profile can include graphs of the <strong>partial pressures</strong> of O<sub>2</sub>,
-N<sub>2</sub>, and He during the dive (see figure above) as well as a calculated and
-dive computer reported deco ceilings (only visible for deep, long, or
-repetitive dives).  Partial pressures of oxygen are indicated in green,
-those of nitrogen in black, and those of helium in dark red. These partial
-pressure graphs are shown below the profile data.</p></div>
-<div class="admonitionblock">
-<table><tr>
-<td class="icon">
-<img src="images/icons/O2.jpg" alt="Note" />
-</td>
-<td class="content">Clicking this button allows display of the partial pressure of <strong>oxygen</strong>
-during the dive. This is depicted below the dive depth and water temperature
-graphs.</td>
-</tr></table>
-</div>
-<div class="admonitionblock">
-<table><tr>
-<td class="icon">
-<img src="images/icons/N2.jpg" alt="Note" />
-</td>
-<td class="content">Clicking this button allows display of the partial pressure of <strong>nitrogen</strong>
-during the dive.</td>
-</tr></table>
-</div>
-<div class="admonitionblock">
-<table><tr>
-<td class="icon">
-<img src="images/icons/He.jpg" alt="Note" />
-</td>
-<td class="content">Clicking this button allows display of the partial pressure of <strong>helium</strong>
-during the dive.  This is only of importance to divers using Trimix,
-Helitrox or similar breathing gasses.</td>
-</tr></table>
-</div>
-<div class="paragraph"><p>The <strong>air consumption</strong> graph displays the tank pressure and its change during
-the dive. The air consumption takes depth into account so that even when
-manually entering the start and end pressures the graph is not a straight
-line.  Similarly to the depth graph the slope of the tank pressure gives the
-user information about the momentary SAC rate (Surface Air Consumption) when
-using an air integrated dive computer.  Here the colour coding is not
-relative to some absolute values but relative to the average normalised air
-consumption during the dive. So areas that are red or orange indicate times
-of increased normalized air consumption while dark green reflects times when
-the diver was using less gas than average.</p></div>
-<div class="admonitionblock">
-<table><tr>
-<td class="icon">
-<img src="images/icons/Heartbutton.png" alt="Note" />
-</td>
-<td class="content">Clicking on the heart rate button will allow the display of heart rate
-information during the dive if the dive computer was attached to a heart
-rate sensor.</td>
-</tr></table>
-</div>
-<div class="paragraph"><p>It is possible to <strong>zoom</strong> into the profile graph. This is done either by using
-the scroll wheel / scroll gesture of your mouse or trackpad. By default
-<em>Subsurface</em> always shows a profile area large enough for at least 30 minutes
-and 30m
- (100ft) – this way short or shallow dives are intuitively recognizable;
-something
-that free divers clearly won’t care about.</p></div>
-<div class="imageblock" style="text-align:center;">
-<div class="content">
-<img src="images/MeasuringBar.png" alt="FIGURE: Measuring Bar" />
-</div>
-</div>
-<div class="admonitionblock">
-<table><tr>
-<td class="icon">
-<img src="images/icons/ruler.jpg" alt="Note" />
-</td>
-<td class="content">Measurements of <strong>depth or time differences</strong> can be achieved by using the
-<strong>ruler button</strong> on the left of the dive profile panel.  The measurement is
-done by dragging the red dots to the two points on the dive profile that the
-user wishes to measure. Information is then given in the horizontal white
-area underneath the two red dots.</td>
-</tr></table>
-</div>
-<div class="admonitionblock">
-<table><tr>
-<td class="icon">
-<img src="images/icons/ShowPhotos.png" alt="Note" />
-</td>
-<td class="content">Photographs that have been added to a dive can be shown on the profile by
-selecting the <strong>Show-photo</strong> button. The position of a photo on the profile
-indicates the exact time when this photo was taken. If this button is not
-active, the photos are hidden.</td>
-</tr></table>
-</div>
-<div class="paragraph"><p>The profile can also include the dive computer reported <strong>ceiling</strong> (more
-precisely, the deepest deco stop that the dive computer calculated for each
-particular moment in time) as a red overlay on the dive profile. Ascent
-ceilings arise when a direct ascent to the surface increases the risk of a
-diver suffering from decompression sickness (DCS) and it is necessary to
-either ascend slower or to perform decompression stop(s) before ascending to
-the surface. Not all dive computers record this information and make it
-available for download; for example all of the Suunto dive computers fail to
-make this very useful data available to divelog software. <em>Subsurface</em> also
-calculates ceilings independently, shown as a green overlay on the dive
-profile.  Because of the differences in algorithms used and amount of data
-available (and other factors taken into consideration at the time of the
-calculation) it is unlikely that ceilings from dive computers and from
-<em>Subsurface</em> are the same, even if the same algorithm and <em>gradient factors</em>
-(see below) are used.  It is also quite common that <em>Subsurface</em> calculates
-a ceiling for non-decompression dives when the dive computer stayed in
-non-deco mode during the whole dive (represented by the <span class="green">dark green</span>
-section in the profile at the beginning of this section). This is caused by
-the fact that <em>Subsurface’s</em> calculations describe the deco obligation at
-each moment during a dive, while dive computers usually take the upcoming
-ascent into account. During the ascent some excess nitrogen (and possibly
-helium) are already breathed off so even though the diver technically
-encountered a ceiling at depth, the dive still does not require an explicit
-deco stop. This feature allows dive computers to offer longer non-stop
-bottom times.</p></div>
-<div class="admonitionblock">
-<table><tr>
-<td class="icon">
-<img src="images/icons/cceiling.jpg" alt="Note" />
-</td>
-<td class="content">If the dive computer itself calculates a ceiling and makes it available to
-<em>Subsurface</em> during upload of dives, this can be shown as a red area by
-checking <strong>Dive computer reported ceiling</strong> button on the Profile Panel.</td>
-</tr></table>
-</div>
-<div class="admonitionblock">
-<table><tr>
-<td class="icon">
-<img src="images/icons/ceiling1.jpg" alt="Note" />
-</td>
-<td class="content">If the <strong>Calculated ceiling</strong> button on the Profile Panel is clicked, then a
-ceiling, calculated by <em>Subsurface</em>, is shown in green if it exists for a
-particular dive (<strong>A</strong> in figure below). This setting can be modified in two
-ways:</td>
-</tr></table>
-</div>
-<div class="admonitionblock">
-<table><tr>
-<td class="icon">
-<img src="images/icons/ceiling2.jpg" alt="Note" />
-</td>
-<td class="content">If, in addition, the <strong>show all tissues</strong> button on the Profile Panel is
-clicked, the ceiling is shown for the tissue compartments following the
-Bühlmann model (<strong>B</strong> in figure below).</td>
-</tr></table>
-</div>
-<div class="admonitionblock">
-<table><tr>
-<td class="icon">
-<img src="images/icons/ceiling3.jpg" alt="Note" />
-</td>
-<td class="content">If, in addition, the <strong>3m increments</strong> button on the Profile Panel is clicked,
-then the ceiling is indicated in 3 m increments (<strong>C</strong> in figure below).</td>
-</tr></table>
-</div>
-<div class="imageblock" style="text-align:center;">
-<div class="content">
-<img src="images/Ceilings2.jpg" alt="Figure: Ceiling with 3m resolution" />
-</div>
-</div>
-<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).  Tissue pressures are calculated using the Bühlmann
-ZH-L16 algorithm and are displayed as lines ranging from green (faster
-tissues) to blue (slower tissues).  The black line, graphed above the
-ambient pressure, is the maximum allowable tissue supersaturation (pressure
-limit) derived from the gradient factors specified in the <strong>Preferences</strong>. For
-divers involved in planned decompression diving, efficient rates of
-offgasing are obtained with tissue pressures between the ambient inert gas
-pressure (grey line) and the pressure limit (black line). This display is a
-representation of the tissue pressures during the whole dive. In contrast,
-the <a href="#S_gas_pressure_graph">Gas Pressure Graph</a> in the <strong>Information Box</strong>
-on the <strong>Dive Profile</strong> is an instantaneous reflection of tissue pressures at
-the moment in time reflected by the position of the cursor on the dive
-profile.</td>
-</tr></table>
-</div>
-<div class="imageblock" style="text-align:center;">
-<div class="content">
-<img src="images/tissuesGraph.jpg" alt="Figure: Inert gas tissue pressure graph" />
-</div>
-</div>
-<div class="paragraph"><p>Gradient Factor settings strongly affect the calculated ceilings and their
-depths.  For more information about Gradient factors, see the section on
-<a href="#S_GradientFactors">Gradient Factor Preference settings</a>. The currently
-used gradient factors (e.g. GF 35/75) are shown above the depth profile if
-the appropriate toolbar buttons are activated.  <strong>N.B.:</strong> The indicated
-gradient factors are NOT the gradient factors in use by the dive computer,
-but those used by <em>Subsurface</em> to calculate deco obligations during the
-dive. For more information external to this manual see:</p></div>
-<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>
-</p>
-</li>
-<li>
-<p>
-<a href="http://www.rebreatherworld.com/general-and-new-to-rebreather-articles/5037-gradient-factors-for-dummies.html">Gradient factors for dummies, by Kevin Watts</a>
-</p>
-</li>
-</ul></div>
-</div>
-<div class="sect2">
-<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 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 involve
-a selection of which gas is being switched to, the list of choices being
-based on the available gases defined in the <strong>Equipment</strong> Tab. Set-point
-change events open a dialog allowing to choose the next set-point value. As
-in the planner, a set-point value of zero indicates the diver is breathing
-from an open circuit system while any non-zero value 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="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 only the top line of the Information Box is visible (see
-left-hand part of figure (<strong>A</strong>) below). The Information Box can be moved
-around in the <strong>Dive Profile</strong> panel by click-dragging it with the mouse so
-that it is not obstructing important detail. The position of the Information
-Box is saved and used again during subsequent dive analyses.</p></div>
-<div class="imageblock" style="text-align:center;">
-<div class="content">
-<img src="images/InfoBox2.jpg" alt="Figure: Information Box" />
-</div>
-</div>
-<div class="paragraph"><p>The moment the mouse points inside the <strong>Dive Profile</strong> panel, the information
-box expands and shows many data items. In this situation, the data reflect
-the time point along the dive profile indicated by the mouse cursor (see
-right-hand part of figure (<strong>B</strong>) above where the Information Box reflects the
-situation at the position of the cursor [arrow] in that image). Therefore,
-moving the cursor in the horizontal direction allows the Information Box to
-show information for any point along the dive profile.  In this mode, the
-Information Box gives extensive statistics about depth, gas and ceiling
-characteristics of the particular dive. These include: Time period into the
-dive (indicated by a @), depth, cylinder pressure (P), temperature,
-ascent/descent rate, surface air consumption (SAC), oxygen partial pressure,
-maximum operating depth, equivalent air depth (EAD), equivalent narcotic
-depth (END), equivalent air density depth (EADD), decompression requirements
-at that instant in time (Deco), time to surface (TTS), the calculated
-ceiling, as well as the calculated ceiling for several Bühlmann tissue
-compartments.</p></div>
-<div class="paragraph"><p>The user has control over the display of several statistics, represented as
-four buttons on the left of the profile panel. These are:</p></div>
-<div class="admonitionblock">
-<table><tr>
-<td class="icon">
-<img src="images/icons/MOD.jpg" alt="Note" />
-</td>
-<td class="content">Clicking this button causes the Information Box to display the <strong>Maximum
-Operating Depth (MOD)</strong> of the dive, given the gas mixture used. MOD is
-dependent on the oxygen concentration in the breathing gas.  For air (21%
-oxygen) it is around 57 m if a maximum pO<sub>2</sub> of 1.4 is specified in the
-<strong>Preferences</strong> section (select <em>File</em> &#8594; Preferences &#8594; Graph_ and edit the
-text box <em>Max pO<sub>2</sub> when showing MOD</em>.  Below the MOD there is a markedly
-increased risk of exposure to the dangers associated with oxygen toxicity.</td>
-</tr></table>
-</div>
-<div class="admonitionblock">
-<table><tr>
-<td class="icon">
-<img src="images/icons/NDL.jpg" alt="Note" />
-</td>
-<td class="content">Clicking this button causes the Information Box to display the <strong>No-deco
-Limit (NDL)</strong> or the <strong>Total Time to Surface (TTS)</strong>. NDL is the time duration
-that a diver can continue with a dive, given the present depth, that does
-not require decompression (that is, before an ascent ceiling appears). Once
-one has exceeded the NDL and decompression is required (that is, there is an
-ascent ceiling above the diver, then TTS gives the number of minutes
-required before the diver can surface. TTS includes ascent time as well as
-decompression time.</td>
-</tr></table>
-</div>
-<div class="admonitionblock">
-<table><tr>
-<td class="icon">
-<img src="images/icons/SAC.jpg" alt="Note" />
-</td>
-<td class="content">Clicking this button causes the Information Box to display the <strong>Surface Air
-Consumption (SAC)</strong>.  SAC is an indication of the surface-normalised
-respiration rate of a diver. The value of SAC is less than the real
-respiration rate because a diver at 10m uses breathing gas at a rate roughly
-double that of the equivalent rate at the surface. SAC gives an indication
-of breathing gas consumption rate independent of the depth of the dive so
-that the respiratory rates of different dives can be compared. The units for
-SAC is litres/min or cub ft/min.</td>
-</tr></table>
-</div>
-<div class="admonitionblock">
-<table><tr>
-<td class="icon">
-<img src="images/icons/EAD.jpg" alt="Note" />
-</td>
-<td class="content">Clicking this button displays the <strong>Equivalent Air Depth (EAD)</strong> for nitrox
-dives as well as the <strong>Equivalent Narcotic Depth (END)</strong> for trimix
-dives. These are numbers of importance to divers who use breathing gases
-other than air. Their values are dependent on the composition of the
-breathing gas.  The EAD is the depth of a hypothetical air dive that has the
-same partial pressure of nitrogen as the current depth of the nitrox dive at
-hand. A nitrox dive leads to the same decompression obligation as an air
-dive to the depth equalling the EAD. The END is the depth of a hypothetical
-air dive that has the same sum of partial pressures of the narcotic gases
-nitrogen and oxygen as the current trimix dive. A trimix diver can expect
-the same narcotic effect as a diver breathing air diving at a depth
-equalling the END.</td>
-</tr></table>
-</div>
-<div class="paragraph"><p>Figure (<strong>B</strong>) above shows an information box with a nearly complete set of
-data.</p></div>
-<div class="sect3">
-<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 of the cursor on the <strong>Dive Profile</strong>. The
-drawing on the left below indicates the meaning of the different parts of
-the Gas Pressure Bar Graph.</p></div>
-<div class="imageblock" style="text-align:center;">
-<div class="content">
-<img src="images/GasPressureBarGraph.jpg" alt="FIGURE:Gas Pressure bar Graph" />
-</div>
-</div>
-<div class="ulist"><ul>
-<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.
-</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.
-</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.
-</p>
-</li>
-<li>
-<p>
-The top black horizontal line indicates the gradient factor that applies to
-  the depth of the diver at the particular point on the <strong>Dive Profile</strong>. The
-  gradient factor shown is an interpolation between the GFLow and GFHigh
-  values specified in the Graph tab of the <strong>Preferences Panel</strong> of
-  <strong>Subsurface</strong>.
-</p>
-</li>
-<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.
-</p>
-</li>
-</ul></div>
-<div class="paragraph"><p>These five values are indicated on the left in the graph above. The way the
-Gas Pressure Bar Graph changes during a dive is indicated on the right hand
-side of the above figure for a diver using EAN32.</p></div>
-<div class="ulist"><ul>
-<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
-  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.
-</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.
-</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.
-</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>.
-</p>
-</li>
-</ul></div>
-</div>
-</div>
-</div>
-</div>
-<div class="sect1">
-<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">7.1. The Dive List context menu</h3>
-<div class="paragraph"><p>Several actions on either a single dive or a group of dives can be performed
-using the Dive List Context Menu, found by selecting either a single dive or
-a group of dives and then right-clicking.</p></div>
-<div class="imageblock" style="text-align:center;">
-<div class="content">
-<img src="images/ContextMenu.jpg" alt="Figure: Context Menu" />
-</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_columns_showed_in_the_strong_dive_list_strong_panel">7.1.1. Customising the columns showed in the <strong>Dive List</strong> panel</h4>
-<div class="imageblock" style="text-align:center;">
-<div class="content">
-<img src="images/DiveListOptions.jpg" alt="Example: Dive list info options" />
-</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 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 (reflected by the check symbols) and the list is immediately
-updated. Preferences for information shown in the <strong>Dive List</strong> are saved and
-used when <em>Subsurface</em> is re-opened.</p></div>
-</div>
-</div>
-<div class="sect2">
-<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 given a choice with
-respect to the lowest sequence number to be used.  Completing this operation
-results in new sequence numbers (based on date/time)  for the dives in the
-<strong>Dive List</strong> panel.</p></div>
-<div class="paragraph"><p>One can also renumber a few selected dives in the dive list. Select the
-dives that need renumbering. Right-click on the selected list and use the
-Dive List Context Menu to perform the renumbering. A popup window appears
-requiring the user to specify the starting number for the renumbering
-process.</p></div>
-</div>
-<div class="sect2">
-<h3 id="S_Group">7.3. Grouping dives into trips and manipulating trips</h3>
-<div class="paragraph"><p>For regular divers, the dive list can rapidly become very long. <em>Subsurface</em>
-can group dives into <em>trips</em>. It performs this by grouping dives that have
-date/times not separated in time by more than two days, thus creating a
-single heading for each diving trip represented in the dive log. Below is an
-ungrouped dive list (<strong>A</strong>, on the left) as well as the corresponding grouped
-dive list comprising five dive trips (<strong>B</strong>, on the right):</p></div>
-<div class="imageblock" style="text-align:center;">
-<div class="content">
-<img src="images/Group2.jpg" alt="Figure: Grouping dives" />
-</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) select <em>Log &#8594; Autogroup</em>. The <strong>Dive List</strong> panel
-now shows only the titles for the trips.</p></div>
-<div class="sect3">
-<h4 id="_editing_the_title_and_associated_information_for_a_particular_trip">7.3.1. Editing the title and associated information for a particular trip</h4>
-<div class="paragraph"><p>Normally, in the dive list, minimal information is included in the trip
-title.  More information about a trip can be added by selecting its trip
-title from the <strong>Dive List</strong>. This shows a <strong>Trip Notes</strong> tab in the <strong>Notes</strong>
-panel. Here one can add or edit information about the date/time, the trip
-location and any other general comments about the trip as a whole (e.g. the
-dive company that was dived with, the general weather and surface conditions
-during the trip, etc.).  After entering this information, select <strong>Save</strong> from
-the buttons at the top right of the <strong>Trip Notes</strong> tab. The trip title in the
-<strong>Dive List</strong> panel should now reflect the edited information.</p></div>
-</div>
-<div class="sect3">
-<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">7.3.3. Collapsing or expanding dive information for different trips</h4>
-<div class="paragraph"><p>After selecting a particular trip in the dive list, the context menu allows
-several possibilities to expand or collapse dives within trips. This
-includes expanding all trips and collapsing all trips.</p></div>
-</div>
-<div class="sect3">
-<h4 id="_merging_dives_from_more_than_one_trip_into_a_single_trip">7.3.4. Merging dives from more than one trip into a single trip</h4>
-<div class="paragraph"><p>After selecting a trip title, the context menu allows the merging of trips
-by either merging the selected trip with the trip below or with the trip
-above. (Merge trip with trip below; Merge trip with trip above)</p></div>
-</div>
-<div class="sect3">
-<h4 id="_splitting_a_single_trip_into_more_than_one_trip">7.3.5. Splitting a single trip into more than one trip</h4>
-<div class="paragraph"><p>If a trip includes ten dives, the user can split this trip into two trips
-(trip 1: top 4 dives; trip 2: bottom 6 dives) by selecting and
-right-clicking the top four dives. The resulting context menu allows the
-user to create a new trip by choosing the option <strong>Create new trip
-above</strong>. The top four dives are then grouped into a separate trip. The
-figures below shows the selection and context menu on the left (A) and the
-completed action on the right (B):</p></div>
-<div class="imageblock" style="text-align:center;">
-<div class="content">
-<img src="images/SplitDive3a.jpg" alt="FIGURE: Split a trip into 2 trips" />
-</div>
-</div>
-</div>
-</div>
-<div class="sect2">
-<h3 id="_manipulating_single_dives">7.4. Manipulating single dives</h3>
-<div class="sect3">
-<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
-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">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)  from trip</strong>. The dive(s) now
-appear immediately above or below the trip to which they belonged, depending
-on the date and time of the unlinked dive.</p></div>
-</div>
-<div class="sect3">
-<h4 id="_add_a_dive_to_the_trip_immediately_above">7.4.3. Add a dive to the trip immediately above</h4>
-<div class="paragraph"><p>Selected dives can be moved from the trip to which they belong and placed
-within a separate trip. To do this, select and right-click the dive(s) to
-bring up the context menu, and then select <strong>Create new trip above</strong>.</p></div>
-</div>
-<div class="sect3">
-<h4 id="_shift_the_start_time_of_dive_s">7.4.4. Shift the start time of dive(s)</h4>
-<div class="paragraph"><p>Sometimes it is necessary to adjust the start time of a dive. This may apply
-to situations where dives are performed in different time zones or when the
-dive computer has an erroneous time. In order to do this, select and
-right-click the dive(s) to be adjusted. This action brings up the context
-menu on which the <strong>Shift times</strong> option should be selected. User must then
-specify the time (in hours and minutes) by which the dives should be
-adjusted and click on the option indicating whether the time adjustment
-should be ealier or later.</p></div>
-</div>
-<div class="sect3">
-<h4 id="_merge_dives_into_a_single_dive">7.4.5. Merge dives into a single dive</h4>
-<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 merge these dives onto a single dive by selecting the
-appropriate dives, right-clicking them to bring up the context menu and then
-selecting <strong>Merge selected dives</strong>. It may be necessary to edit the dive
-information in the <strong>Notes</strong> panel to reflect events or conditions that apply
-to the merged dive. The figure below shows the depth profile of two dives
-that were merged:</p></div>
-<div class="imageblock" style="text-align:center;">
-<div class="content">
-<img src="images/MergedDive.png" alt="Example: Merged dive" />
-</div>
-</div>
-</div>
-<div class="sect3">
-<h4 id="_undo_dive_manipulations">7.4.6. Undo dive manipulations</h4>
-<div class="paragraph"><p>Important actions on dives or trips, described above, can be undone or
-redone.  This includes: <em>delete dives</em>, <em>merge dives</em>, <em>renumber dives</em> and
-<em>shift dive times</em>.  To do this after performing any of these actions, from
-the <strong>Main Menu</strong> select <em>Edit</em>. This brings up the possibility to <em>Undo</em> or
-<em>Redo</em> an action.</p></div>
-</div>
-</div>
-<div class="sect2">
-<h3 id="S_Filter">7.5. Filtering the dive list</h3>
-<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 <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 (see image below). The
-<em>Filter Panel</em> can be reset (i.e. all current filters cleared) by selecting
-the <strong>yellow angled arrow</strong>. The <em>Filter Panel</em> may also be minimised by
-selecting the <strong>green up-arrow". When minimised, only these three icons are
-shown.  The panel can be maximised by clicking the icon that minimised the
-panel. The filter may also be reset and closed by selecting the *red button</strong>
-with the white cross.</p></div>
-<div class="imageblock" style="text-align:center;">
-<div class="content">
-<img src="images/Filterpanel.jpg" alt="Figure: Filter panel" />
-</div>
-</div>
-<div class="paragraph"><p>Four filter criteria may be used to filter the dive list: dive tags, person
-(buddy / dive master), dive site and dive suit, each of which is represented
-by a check list with check boxes. Above each check list is a second-level
-filter tool, allowing the listing of only some of the attributes within that
-check list. For instance, typing "<em>ca</em>" in the filter textbox above the tags
-check list results in the tags check list being reduced to "<em>cave</em>" and
-"<em>cavern</em>". Filtering of the check list enables the rapid finding of search
-terms for filtering the dive list.</p></div>
-<div class="paragraph"><p>To activate filtering of the dive list, check at least one check box in one
-of the four check lists. The dive list is then shortened to include only the
-dives that pertain to the criteria specified in the check lists.  The four
-check lists work as a filter with <em>AND</em> operators, Subsurface filters
-therefore for <em>cave</em> as a tag AND <em>Joe Smith</em> as a buddy; but the filters
-within a category are inclusive - filtering for <em>cave</em> and <em>boat</em> shows
-those dives that have either one OR both of these tags.</p></div>
-</div>
-</div>
-</div>
-<div class="sect1">
-<h2 id="S_ExportLog">8. Exporting the dive log or parts of the dive log</h2>
-<div class="sectionbody">
-<div class="paragraph"><p>There are two routes for the export of dive information from Subsurface:</p></div>
-<div class="ulist"><ul>
-<li>
-<p>
-Exporter les informations de plongée vers <em>Facebook</em>
-</p>
-</li>
-<li>
-<p>
-<a href="#S_Export_other">Exporter des informations de plongée vers d&#8217;autres
-  destinations ou formats</a>
-</p>
-</li>
-</ul></div>
-<div class="sect2">
-<h3 id="S_facebook">8.1. Export des informations de plongée vers <em>Facebook</em></h3>
-<div class="paragraph"><p>L&#8217;export des plongées vers <em>Facebook</em> est géré différemment des autres types
-d&#8217;export car une connexion vers <em>Facebook</em> est nécessaire, nécessitant un
-identifiant et un mot de passe. À partir du menu principal, si vous
-sélectionnez <em>Fichier &#8594; Préférences &#8594; Facebook</em>, un écran de connexion est
-présenté (image <strong>A</strong> sur la gauche, ci dessous). Entrez l&#8217;identifiant et le
-mot de passe <em>Facebook</em>. Une fois connecté à <em>Facebook</em>, le panneau de
-l&#8217;image <strong>B</strong> ci dessous est présenté, avec un bouton <em>Déconnecter de
-Facebook</em> pour fermer la connexion <em>Facebook</em>.</p></div>
-<div class="imageblock" style="text-align:center;">
-<div class="content">
-<img src="images/facebook1_f20.jpg" alt="Figure: Facebook login" />
-</div>
-</div>
-<div class="paragraph"><p>From the <em>Subsurface</em> window it is easy to determe whether <em>Subsurface</em> has
-a valid connection to <em>Facebook</em> From the <strong>Main Menu</strong>, select <em>Share on &#8594;
-Facebook</em> (image <strong>A</strong>, below). Normally, the <em>Facebook</em> option is greyed
-out. But if there is a connection to <em>Facebook</em>, this option is active
-(i.e. in black colour and can be selected).</p></div>
-<div class="paragraph"><p>Une fois qu&#8217;une connexion à <em>Facebook</em> est établie, transférer un profil de
-plongée vers <em>Facebook</em> est facile. Assurez-vous que la plongée à transférer
-est affichée dans le panneau <strong>Profil de plongée</strong> de <em>Subsurface</em>. Si, à
-partir du <strong>menu principal</strong>, vous sélectionnez <em>Partager sur &#8594; Facebook</em>,
-une fenêtre s&#8217;affiche, pour déterminer quelles informations seront
-transférées avec le profil de plongée (voir l&#8217;image <strong>B</strong> ci-dessous). Pour
-transférer un profil de plongée vers <em>Facebook</em>, le nom d&#8217;un album
-<em>Facebook</em> doit être fourni. Les cases à cocher sur la partie gauche
-permettent de sélectionner des informations supplémentaires à transférer
-avec le profil de plongée. Ces informations sont affichées dans le champs de
-texte sur la partie droite du panneau. (image <strong>B</strong> ci dessous). Vous pouvez
-facilement modifier le message qui sera envoyé avec le profil de
-plongée. Une fois les informations supplémentaires ajoutées et vérifiées,
-sélectionner le bouton <em>OK</em> qui lance le transfert vers <em>Facebook</em>. Après un
-moment, une fenêtre apparait indiquant le succès du transfert.</p></div>
-<div class="paragraph"><p>À la fois l&#8217;album créé et la publication sur votre ligne temporelle seront
-marquées comme privés. Pour que vos amis puissent voir la publication,
-modifier les permissions à partir d&#8217;une connexion Facebook standard depuis
-un navigateur ou l&#8217;application Facebook. Malgré que cela soit une étape
-supplémentaire, c&#8217;est la meilleure solution pour éviter d&#8217;avoir des
-publications non désirées sur votre ligne temporelle publique.</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>Si besoin, fermer la connexion <em>Facebook</em> en fermant <em>Subsurface</em> ou en
-sélectionnant _Fichier &#8594; Préférences &#8594; Facebook, à partir du menu
-principal et en cliquant sur le bouton approprié dans le panneau des
-préférences Facebook.</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_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>
-<div class="ulist"><ul>
-<li>
-<p>
-<em>Subsurface XML</em> format. This is the native format used by <em>Subsurface</em>.
-</p>
-</li>
-<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.
-</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>.
-</p>
-</li>
-<li>
-<p>
-<em>DiveShare</em> is also a dive log repository 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>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. The HTML export cannot be changed or edited.  It contains
-  most of the information recorded in the dive log. However, it does not show
-  the calculated values in the <strong>Dive Profile</strong> panel, e.g. calculated cylinder
-  pressure, gas pressures and MOD. The HTML export contains a search option to
-  search the dive log. HTML export is specified on the second tab of the
-  Export dialog (image <strong>B</strong> above). A typical use of this option is to export
-  all one&#8217;s dives to a smartphone or a tablet where it would serve as a very
-  portable record of dives useful for dive companies that wish to verify the
-  dive history of a diver, often doing away with the need to carry one&#8217;s
-  original logbook with one when doing dives with dive companies.
-</p>
-</li>
-<li>
-<p>
-<em>Worldmap</em> format, an HTML file with a world map upon which each dive and
-  some information about it are indicated. This map is not editable. 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>
-<p>
-<em>General Settings</em>, under the HTML tab, provides the following options:
-</p>
-<div class="ulist"><ul>
-<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.
-</p>
-</li>
-<li>
-<p>
-Export Yearly Statistics: if this option is checked, a yearly statistics table will
-   be attached to the HTML exports.
-</p>
-</li>
-<li>
-<p>
-Export List only: a list of dives only (date, time, depth, duration) will be exported
-   and the detailed dive information, e.g. dive profile, will not be available.
-</p>
-</li>
-</ul></div>
-</li>
-<li>
-<p>
-Under <em>Style Options</em> some style-related options are available like font
-  size and theme.
-</p>
-</li>
-</ul></div>
-<div class="paragraph"><p>Export to other formats can be achieved through third party facilities, for
-instance <em>www.divelogs.de</em>.</p></div>
-</div>
-</div>
-</div>
-<div class="sect1">
-<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 for admission to further training courses or
-(sometimes) even diving sites. The security of the dive log is therefore
-critical. In order to have a dive log that is resistant to failure of a home
-computer hard drive, loss or theft of equipment, the Cloud is an obvious
-solution. This also has the added benefit that one can access one&#8217;s dive log
-from anywhere in the world without having to carry it with oneself. For this
-reason, facilities such as <em>divelogs.de</em> and <em>Diving Log</em> offer to store
-dive log information on the Internet.</p></div>
-<div class="paragraph"><p><em>Subsurface</em> includes access to a transparently integrated cloud storage
-back end that is available to all Subsurface users. Storing and retrieving a
-dive log from the cloud is no more difficult than accessing the dives on the
-local hard disk.  The only requirement is that one should first register as
-a user on the cloud.  To use <em>Subsurface cloud storage</em> , follow these
-steps:</p></div>
-<div class="sect2">
-<h3 id="_create_a_cloud_storage_account">9.1. Create a cloud storage account</h3>
-<div class="ulist"><ul>
-<li>
-<p>
-Open the <strong>Network Preferences</strong> by selecting <em>File</em> &#8594; <em>Preferences</em> &#8594; <em>Network</em>.
-</p>
-</li>
-<li>
-<p>
-In the section headed <em>Subsurface cloud storage</em>, enter an email address that
-   <em>Subsurface</em> can use for user registration.
-</p>
-</li>
-<li>
-<p>
-Enter a novel password that <em>Subsurface</em> will use to store the
-  dive log in the cloud.
-</p>
-</li>
-<li>
-<p>
-Click <em>Apply</em> to send the above email address and password to the
-  (remote) cloud server. The server responds by sending a verification PIN to
-  the above email address (This is the <strong>only</strong> occasion that <em>Subsurface</em> uses the
-  email address provided above). The <strong>Network Preferences</strong> dialog now has a new PIN text
-   box, not visible previously.
-</p>
-</li>
-<li>
-<p>
-Enter the PIN in the corresponding text box in the <strong>Network Preferences</strong> dialog
-(this field is only visible while the server is waiting for email
-address confirmation)
-</p>
-</li>
-<li>
-<p>
-Click <em>Apply</em> again. The <em>Subsurface cloud storage</em> account
-will be marked as verified and the <em>Subsurface cloud storage</em> service is initialised for use.
-</p>
-</li>
-</ul></div>
-</div>
-<div class="sect2">
-<h3 id="_using_em_subsurface_cloud_storage_em">9.2. Using <em>Subsurface cloud storage</em></h3>
-<div class="ulist"><ul>
-<li>
-<p>
-Once the cloud storage has been initialised, two new items appear in the
-   <em>File</em> menu of the main menu system: <em>Open cloud storage</em> and <em>Save to cloud storage</em>.
-These options allow the user to load and save data to the <em>Subsurface
-cloud storage</em> server.
-</p>
-</li>
-<li>
-<p>
-In the <em>Defaults Preferences</em> tab, one can select to use the <em>Subsurface cloud
-storage</em> data as one&#8217;s default data file by checking the check box marked <em>Cloud storage default file</em>.
- This means that the data from
-the <em>Subsurface cloud storage</em> is loaded when <em>Subsurface</em> starts ans saved there when one closes <em>Subsurface</em>.
-</p>
-</li>
-<li>
-<p>
-<em>Subsurface</em> keeps a local copy of the data and the cloud facility remains fully
-functional even if used while disconnected to the Internet. <em>Subsurface</em> simply synchronises the
-data with the cloud server the next time ithe program is used while the computer is
-connected to the Internet.
-</p>
-</li>
-</ul></div>
-</div>
-<div class="sect2">
-<h3 id="S_Cloud_storage">9.3. Web access to <em>Subsurface cloud storage</em></h3>
-<div class="paragraph"><p>One of the nice side benefits of using <em>Subsurface cloud storage</em> is that
-one can also access one&#8217;s dive data from any web browser. Simply open
-<a href="https://cloud.subsurface-divelog.org"><em>https://cloud.subsurface-divelog.org</em></a>,
-log in with the same email and password, and you can see an HTML export of
-the last dive data that was synced to the <em>Subsurface cloud storage</em>. The
-dive information that is shown is only the contents of the recorded dive
-logs, NOT the calculated values shown in the <strong>Profile</strong> panel, including some
-cylinder pressures, deco ceilings and O<sub>2</sub>/He/N<sub>2</sub> partial pressures.</p></div>
-</div>
-<div class="sect2">
-<h3 id="_other_cloud_services">9.4. Other cloud services</h3>
-<div class="paragraph"><p>If one prefers not to use the integrated cloud storage of dive logs (and
-don&#8217;t need the web access), it is also simple to store dive logs in the
-cloud using several of the existing facilities on the Internet.  For
-instance <a href="http://www.dropbox.com/"><em>Dropbox</em></a> offers a free application that
-allows files on the Dropbox servers to be seen as a local folder on one&#8217;s
-desktop computer.</p></div>
-<div class="imageblock" style="text-align:center;">
-<div class="content">
-<img src="images/Cloud.jpg" alt="FIGURE: Dropbox folder" />
-</div>
-</div>
-<div class="paragraph"><p>The <em>Dropbox</em> program creates a copy of the <em>Dropbox</em> Internet Cloud content
-on one&#8217;s desktop computer. When the computer is connected to the Internet,
-the Internet content is automatically updated. Therefore both the <em>Open</em> and
-<em>Save</em> of dive logs are done using the local copy of the dive log in the
-local <em>Dropbox</em> folder, so there&#8217;s no need for a direct internet
-connection. If the local copy is modified, e.g. by adding a dive, the remote
-copy in the <em>Dropbox</em> server in the Cloud will be automatically updated
-whenever Internet access is available.</p></div>
-<div class="paragraph"><p>In this way a dive log in one&#8217;s <em>Dropbox</em> folder can be accessed seamlessly
-from the Internet and can be accessed from any place with Internet
-access. Currently there are no costs 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 on <em>Dropbox</em>, select <em>File &#8594; Save as</em> from the
-<em>Subsurface</em> main menu, navigate to the <em>Dropbox</em> folder and select the
-<em>Save</em> button. To access the dive log in <em>Dropbox</em>, select <em>File &#8594; Open
-Logbook</em> from the <em>Subsurface</em> main menu and navigate to the dive log file
-in the <em>Dropbox</em> folder and select the <em>Open</em> button.</p></div>
-<div class="paragraph"><p>Several paid services exist on the Internet (e.g. Google, Amazon) where the
-same process could be used for the Cloud-based storage of dive logs.</p></div>
-</div>
-</div>
-</div>
-<div class="sect1">
-<h2 id="S_PrintDivelog">10. Printing a dive log</h2>
-<div class="sectionbody">
-<div class="paragraph"><p><em>Subsurface</em> provides a simple and flexible interface to print a whole dive log or only a few selected dives.
-  Pre-installed templates or a custom written template can be used to choose where the data are fitted into the page.</p></div>
-<div class="paragraph"><p>Before printing, two decisions are required:</p></div>
-<div class="ulist"><ul>
-<li>
-<p>
-Should the whole dive log be printed or only part of it? If only part of the
-  dive log is required, then select the required dives from the <strong>Dive List</strong>
-  panel.
-</p>
-</li>
-<li>
-<p>
-If the dive profiles needs printing, what gas partial pressure information
-  should be shown? Select the appropriate toggle-buttons on the button bar to
-  the left of the <strong>Dive Profile</strong> panel.
-</p>
-</li>
-</ul></div>
-<div class="paragraph"><p>If <em>File &#8594; Print</em> is selected from the Main menu, the the dialogue below
-(image <strong>A</strong>) appears. Three specifications are needed to achieve the desired
-information and page layout:</p></div>
-<div class="imageblock" style="text-align:center;">
-<div class="content">
-<img src="images/Print1_f22.jpg" alt="FIGURE: Print dialogue" />
-</div>
-</div>
-<div class="olist arabic"><ol class="arabic">
-<li>
-<p>
-Under <em>Print type</em> select one of two options:
-</p>
-<div class="ulist"><ul>
-<li>
-<p>
-<em>Dive list print</em>: Print dives from the <strong>Dive List</strong> panel with profiles and
-  other information.
-</p>
-</li>
-<li>
-<p>
-<em>Statistics print</em>: Print yearly statistics of the dives.
-</p>
-</li>
-</ul></div>
-</li>
-<li>
-<p>
-Under <em>Print options</em> select:
-</p>
-<div class="ulist"><ul>
-<li>
-<p>
-Printing only the dives selected from the dive list prior to activating the
-  print dialogue by checking the box <em>Print only selected dives</em>. If this
-  check box is <strong>not</strong> checked all dives in the <strong>Dive List</strong> panel are printed.
-</p>
-</li>
-<li>
-<p>
-Printing in colour, achieved by checking the box with <em>Print in colour</em>. If
-  this check box is not checked, printing is in monochrome (grey scale).
-</p>
-</li>
-</ul></div>
-</li>
-</ol></div>
-<div class="paragraph"><p>Under <em>Template</em> select a template to be used as the page layout. There are
-several templates (see image <strong>B</strong>, above).</p></div>
-<div class="ulist"><ul>
-<li>
-<p>
-<em>Table</em>: This prints a summary table of all dives selected (see below).
-</p>
-</li>
-</ul></div>
-<div class="imageblock" style="text-align:center;">
-<div class="content">
-<img src="images/Print_summarylist_f22.jpg" alt="FIGURE: Print summary table" />
-</div>
-</div>
-<div class="ulist"><ul>
-<li>
-<p>
-<em>Flow layout</em>: Print the text associated with each dive without printing the
-  dive profiles
-     of each dive (see below):
-</p>
-</li>
-</ul></div>
-<div class="imageblock" style="text-align:center;">
-<div class="content">
-<img src="images/Print_flow_layout_f22.jpg" alt="FIGURE: Print flow layout" />
-</div>
-</div>
-<div class="ulist"><ul>
-<li>
-<p>
-<em>One Dive</em>: Print one dive per page, also showing the dive profile (see
-  below)
-</p>
-</li>
-</ul></div>
-<div class="imageblock" style="text-align:center;">
-<div class="content">
-<img src="images/print2_f22.jpg" alt="FIGURE: Print one dive / page" />
-</div>
-</div>
-<div class="ulist"><ul>
-<li>
-<p>
-<em>Two Dives</em>: Print two dives per page, also showing the dive profiles.
-</p>
-</li>
-<li>
-<p>
-<em>Six Dives</em>: Print six dives per page, also showing the dive profiles.
-</p>
-</li>
-</ul></div>
-<div class="paragraph"><p>Users can <em>Preview</em> the printed page by selecting the <em>Preview</em> button on
-the dialogue (see image <strong>A</strong> at the start of this section). After preview,
-changes to the options in the print dialogue can be made, resulting in a
-layout that fits personal taste.</p></div>
-<div class="paragraph"><p>Next, select the <em>Print</em> button (see image <strong>A</strong> at the start of this
-section). This activates the regular print dialogue used by the user
-operating system, allowing one to choose a printer and to set its properties
-(see image below):</p></div>
-<div class="imageblock" style="text-align:center;">
-<div class="content">
-<img src="images/Print_print_f22.jpg" alt="FIGURE: Print dialog" />
-</div>
-</div>
-<div class="paragraph"><p>Set the print resolution of the printer to an appropriate value by changing
-the printer <em>Properties</em>. Finally, select the <em>Print</em> button to print the
-dives.  Below is a (rather small) example of the output for one particular
-page.</p></div>
-<div class="imageblock" style="text-align:center;">
-<div class="content">
-<img src="images/Printpreview.jpg" alt="FIGURE: Print preview page" />
-</div>
-</div>
-<div class="sect2">
-<h3 id="_créer_un_modèle_d_8217_impression_personnalisé_avancé">10.1. Créer un modèle d&#8217;impression personnalisé (avancé)</h3>
-<div class="paragraph"><p>Writing a custom template is an effective way to produce highly customized
-printouts. Subsurface uses HTML templates to render printing. One can create
-a template, export a new template, import an existing template and delete an
-existing template by using the appropriate buttons under the <em>Template</em>
-dropdown list in the print dialogue. See <a href="#S_APPENDIX_E">APPENDIX E</a> for
-information on how to write or modify a template.</p></div>
-</div>
-</div>
-</div>
-<div class="sect1">
-<h2 id="S_Configure">11. Configurer un ordinateur de plongée</h2>
-<div class="sectionbody">
-<div class="paragraph"><p><em>Subsurface</em> permet de configurer son ordinateur de plongée. Actuellement,
-les familles d&#8217;ordinateurs supportés sont Heinrichs-Weikamp (OSTC 2, OSTC 3)
-et Suunto Vyper (Stinger, Mosquito, D3, Vyper, Vytec, Cobra, Gekko et
-Zoop). De nombreux paramètres de ces ordinateurs de plongée peuvent être
-lues et modifiées. La première étape est de s&#8217;assurer que les pilotes pour
-votre ordinateur de plongée sont installés (également nécessaire pour
-télécharger les plongées) et que le nom de périphérique de l&#8217;ordinateur de
-plongée est connu. Voir
-<a href="#_appendix_a_operating_system_specific_information_for_importing_dive_information_from_a_dive_computer">ANNEXE A</a> pour plus d&#8217;informations sur la manière de procéder.</p></div>
-<div class="paragraph"><p>Une fois que l&#8217;ordinateur de plongée est connecté à <em>Subsurface</em>,
-sélectionner <em>Fichier &#8594; Configurer l&#8217;ordinateur de plongée</em>, à partir du
-menu principal. Fournir le nom du périphérique dans le champ en haut du
-panneau de configuration et sélectionner le bon modèle d&#8217;ordinateur de
-plongée à partir du panneau à gauche (voir l&#8217;image ci-dessous).</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>En utilisant les boutons appropriés du panneau de configuration, les actions
-suivantes peuvent être réalisées :</p></div>
-<div class="ulist"><ul>
-<li>
-<p>
-<strong>Récupérer les détails disponibles</strong>. Cela charge la configuration existante à partir de l&#8217;ordinateur de plongée
-   dans <em>Subsurface</em>, en l&#8217;affichant dans le panneau de configuration.
-</p>
-</li>
-<li>
-<p>
-<strong>Enregistrer les modifications sur le périphérique</strong>. Cela change la configuration de l&#8217;ordinateur
-   de plongée pour correspondre aux informations affichées dans le panneau de configuration.
-</p>
-</li>
-<li>
-<p>
-<strong>Sauvegarder</strong>. Cela enregistre la configuration dans un fichier. <em>Subsurface</em> demande
-   l&#8217;emplacement et le nom du fichier pour enregistrer les informations.
-</p>
-</li>
-<li>
-<p>
-<strong>Restaurer une sauvegarde</strong>. Cela charge les informations à partir d&#8217;un fichier de sauvegarde et l&#8217;affiche
-   dans le panneau de configuration.
-</p>
-</li>
-<li>
-<p>
-<strong>Mettre à jour le firmware</strong>. Si un nouveau firmware est disponible pour l&#8217;ordinateur de plongée,
-   il sera chargé dans l&#8217;ordinateur de plongée.
-</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 user-definable settings within <em>Subsurface</em>, found by
-selecting <em>File &#8594; Preferences</em>. The settings are performed in seven groups:
-<strong>Defaults</strong>, <strong>Units</strong>, <strong>Graph</strong>, <strong>Language</strong> and <strong>Network</strong>, <strong>Facebook</strong> and
-<strong>Georeference</strong>, all of which operate on the same principles: the user must
-specify the settings that are to be changed, then these changes are saved
-using the <strong>Apply</strong> button. After applying all the new settings users can then
-leave the settings panel by selecting <strong>OK</strong>. If <strong>Discard</strong> is selected,
-changes to the preferences are not saved.</p></div>
-<div class="sect2">
-<h3 id="_defaults">12.1. Defaults</h3>
-<div class="paragraph"><p>There are several settings in the <strong>Defaults</strong> panel:</p></div>
-<div class="imageblock" style="text-align:center;">
-<div class="content">
-<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.
-</p>
-</li>
-<li>
-<p>
-<strong>Dives</strong>: For the <em>Default Dive File</em> one needs to specify the directory and
-     file name of one&#8217;s
-     electronic dive log book. This is a file with filename extension of either <em>.xml</em> or <em>ssrf</em>. When
-     launched, <em>Subsurface</em> will automatically load the specified dive log book. There are three options:
-</p>
-<div class="ulist"><ul>
-<li>
-<p>
-<em>No default file</em>: When checked, <em>Subsurface</em> does not automatically load a dive log at startup.
-</p>
-</li>
-<li>
-<p>
-<em>Local default file</em>: When checked, <em>Subsurface</em> automatically loads a dive log from the local hard disk
-       as described above.
-</p>
-</li>
-<li>
-<p>
-<em>Cloud storage default file</em>: When checked, <em>Subsurface automatically loads the dive log from the cloud
-       device that was initialised using the <strong>Preferences</strong> _Network</em> tab (see below).
-</p>
-</li>
-</ul></div>
-</li>
-<li>
-<p>
-<strong>Display invalid</strong>:  Dives can be marked as invalid (when a user wishes to hide
-     dives that he/she doesn&#8217;t consider valid dives, e.g. pool dives, but still want to
-     keep them in the dive log). This controls whether those dives are displayed in
-     the dive list.
-</p>
-</li>
-<li>
-<p>
-<strong>Default cylinder</strong>: Specify the default cylinder listed in
-     the <strong>Equipment</strong> tab of the <strong>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, and a 0 value representing no animation
-     at all.
-</p>
-</li>
-<li>
-<p>
-<strong>Clear all settings</strong>: As indicated in the button below this heading, all settings are
-     cleared and set to default values.
-</p>
-</li>
-</ul></div>
-</div>
-<div class="sect2">
-<h3 id="_units">12.2. Units</h3>
-<div class="imageblock" style="text-align:center;">
-<div class="content">
-<img src="images/Pref2_f20.jpg" alt="FIGURE: Preferences Units page" />
-</div>
-</div>
-<div class="paragraph"><p>Here users can choose between metric and imperial units of depth, pressure,
-volume, temperature and mass. By selecting the Metric or Imperial radio
-button at the top, one can specify that all units are in the chosen
-measurement system.  Alternatively, if one selects the <strong>Personalise</strong> radio
-button, units can be selected independently, with some units in the metric
-system and others in imperial.</p></div>
-<div class="paragraph"><p>Irrespective of the above settings, dive time measurements can be either in
-seconds or minutes.  Choose the appropriate option. GPS coordinates can be
-represented either as traditional coordinates (degrees, minutes, seconds) or
-as decimal degrees Choose the appropriate option.</p></div>
-</div>
-<div class="sect2">
-<h3 id="_graph">12.3. Graph</h3>
-<div class="imageblock" id="S_CCR_options" style="text-align:center;">
-<div class="content">
-<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>
-<div class="paragraph"><p><strong>Show</strong>: Here users can specify the amount of information shown as part of
-the dive profile:
-<strong> Thresholds: <em>Subsurface</em> can display the nitrogen, oxygen and the helium partial pressures during
-   the dive, enabled by using the toolbar on the left hand side of the <strong>Dive Profile</strong>
-   panel. For each of these graphs users can specify a threshold value on the right-hand side of the
-   Preferences panel. If any of the graphs go above the specified threshold level, the graph is
-   highlighted in red, indicating that the particular partial pressure threshold has been exceeded.
-</strong> <em>Max pO<sub>2</sub> is used for calculating the MOD when displaying the maximum operative depth (MOD)
-   for a dive. Specify an appropriate partial pressure. A value of 1.4 is commonly used.
-<strong> _Draw dive computer reported ceiling red</em>: This checkbox allows exactly what it says. By default
-   the computer reported ceiling is shown in white.
-   Not all dive computers report ceiling values. If the dive computer does report it, it may differ
-   from the ceilings calculated by <em>Subsurface</em> because of the different algorithms and
-   gradient factors, as well as the dynamic way that a
-   dive computer can calculate ceilings during a dive.
-</strong> <em>Show unused cylinders in Equipment Tab</em>: This checkbox allows display of information about unused cylinders when viewing the <strong>Equipment Tab</strong>. Conversely, if this box is not checked, and if any cylinders entered using the <strong>Equipment Tab</strong> are not used (e.g. there was no gas switch to such a cylinder), then these cylinders are omitted from that list.
-<strong>*  <em>Show average depth</em>: If this box is checked, the *Dive Profile</strong> panel contains a grey line that indicates
-    the mean depth of the dive up to any time instant during the dive. Normally this is a u-shaped line indicating the deepest mean depth just before the
-   ascent.</p></div>
-<div class="ulist"><ul>
-<li>
-<p>
-<strong>Misc</strong>:
-</p>
-<div class="ulist" id="GradientFactors_Ref"><ul>
-<li>
-<p>
-Gradient Factors (GFLow and GFHigh):* Set the <em>gradient factors</em> used while diving. GF_Low is
-   the gradient factor at depth and GF_High is used just below the surface.
-   At intermediate depths gradient factors between GF_Low and GF_High are used.
-   Gradient factors add conservatism to the nitrogen exposure during a dive, in a
-   similar way that many dive computers have a conservatism setting. The lower
-   the value of a gradient factor, the more conservative the calculations are with
-   respect to nitrogen loading and the deeper the ascent ceilings are. Gradient
-   factors of 20/60 are considered conservative and values of 70/90 are considered
-   harsh. Checking the <strong>GFLow at max depth</strong> box causes GF_Low to be used at the
-   deepest depth of a dive. If this box is not checked, GF_Low is applied at
-   all depths deeper than the first deco stop. For more information see:
-</p>
-<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>
-</p>
-</li>
-<li>
-<p>
-<a href="http://www.rebreatherworld.com/general-and-new-to-rebreather-articles/5037-gradient-factors-for-dummies.html">Gradient factors for dummies, by Kevin Watts</a>
-</p>
-</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>  maintained
-    during a particular dive. Setpoint changes during the dive can be added via the
-    profile context menu.
-</p>
-</li>
-<li>
-<p>
-<em>pSCR O<sub>2</sub> metabolism rate:</em> For a semiclosed rebreather (pSCR) system, this is the
-    volume of oxygen used by a diver during a 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. A 1:10 ratio is commonly used.
-</p>
-</li>
-</ul></div>
-</li>
-</ul></div>
-</div>
-<div class="sect2">
-<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_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 will be the correct setting; with this <em>Subsurface</em> simply runs in the
-same language / country settings as the underlying operating system. If this
-is for some reason undesirable one can uncheck this checkbox and pick a
-language / country combination from the list of included localizations. The
-<em>Filter</em> text box allows one to list similar languages. For instance there
-are several system variants of English or French. <strong>This particular
-preference requires a restart of <em>Subsurface</em> to take effect</strong>.</p></div>
-</div>
-<div class="sect2">
-<h3 id="_network">12.5. Network</h3>
-<div class="paragraph"><p>This panel facilitates communication between <em>Subsurface</em> and data sources
-on the Internet.  This is important, for instance, when <em>Subsurface</em> needs
-to communicate with Internet services such as Cloud storage or the
-<a href="#S_Companion"><em>Subsurface Companion app</em></a>. These Internet requirements are
-determined by one&#8217;s type of connection to the Internet and by the Internet
-Service Provider (ISP) used.  One&#8217;s ISP should provide the appropriate
-information.</p></div>
-<div class="imageblock" style="text-align:center;">
-<div class="content">
-<img src="images/Pref5_f20.jpg" alt="FIGURE: Preferences Network page" />
-</div>
-</div>
-<div class="paragraph"><p>This dialogue has three sections:</p></div>
-<div class="ulist"><ul>
-<li>
-<p>
-<em>Proxy type</em>:
-If a proxy server is used for Internet access, the type of proxy needs to be selected from the dropdown list,
-after which the IP address of the host and the appropriate port number should
-be provided. If the proxy server uses authentication, the appropriate userID and
-password are required so that <em>Subsurface</em> can automatically pass
-through the proxy server to access the Internet. This information is usually obtained
-from one&#8217;s ISP.
-</p>
-</li>
-<li>
-<p>
-<em>Subsurface cloud storage</em>: To store one&#8217;s dive log in the cloud, a valid email address
-   and password are required. This allows <em>Subsurface</em> to email security information
-   regarding cloud storage to a user, and to set up the cloud storage appropriately.
-   Two additional options are given:
-</p>
-<div class="ulist"><ul>
-<li>
-<p>
-<em>Sync to cloud in the background</em>: This option allows saving of dive information to the cloud storage
-   while the user performs other tasks within <em>Subsurface</em>.
-</p>
-</li>
-<li>
-<p>
-<em>Save password locally</em>: This allows local storage of the cloud storage password. Note that this
-   information is saved in raw text form, not encoded in any way.
-</p>
-</li>
-</ul></div>
-</li>
-<li>
-<p>
-<em>Subsurface web service</em>: When one subscribes to the <a href="#S_Companion">Subsurface web service</a>, a very
-     long and hard-to-remember userID is issued. This is the place to save that userID. By
-     checking the option <em>Save User ID locally?</em>, one ensures that a local copy of that userID
-     is saved.
-</p>
-</li>
-</ul></div>
-</div>
-<div class="sect2">
-<h3 id="S_Facebook">12.6. Accès Facebook</h3>
-<div class="paragraph"><p>Ce panneau vous permet de vous connecter à votre compte Facebook pour
-transférer des informations de Subsurface vers Facebook.</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>Si un identifiant Facebook et un mot de passe valides ont été fournis, une
-connexion vers Facebook est créée. Cette connexion est fermée lorsque
-Subsurface est fermé. Pour le moment, la case à cocher nommée "Conserver ma
-connexion à Subsurface", sur l'écran de connexion, n&#8217;a aucun
-effet. Reportez-vous à la section <a href="#S_facebook">Export des profils de
-plongée vers Facebook</a> pour plus d&#8217;informations.</p></div>
-</div>
-<div class="sect2">
-<h3 id="_georeference">12.7. Georeference</h3>
-<div class="paragraph"><p><em>Subsurface</em> provides a geo-lookup service (that is, given the coordinates
-of a dive site (derived from a click on the <strong>Dive Map panel</strong> at the bottom
-right of the <em>Subsurface</em> window, or from a GPS instrument or from the
-<em>Subsurface</em> Companion app), a lookup on the Internet is performed to find
-the name of the closest known location. Obviously this function only works
-if <em>Subsurface</em> has an Internet connection. The preference of the dive site
-name can be configured, e.g. <em>Country/State/City</em> or <em>City/State/Country</em>
-(see image below).</p></div>
-<div class="imageblock" style="text-align:center;">
-<div class="content">
-<img src="images/Pref7_f20.jpg" alt="FIGURE: Facebook login panel" />
-</div>
-</div>
-</div>
-</div>
-</div>
-<div class="sect1">
-<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="sidebarblock">
-<div class="content">
-<div class="admonitionblock">
-<table><tr>
-<td class="icon">
-<img src="images/icons/warning2.png" alt="Warning" />
-</td>
-<td class="content">The <em>Subsurface</em> dive planner IS CURRENTLY EXPERIMENTAL and assumes the user
-is already familiar with the <em>Subsurface</em> user interface. It is explicitly
-used under the following conditions:</td>
-</tr></table>
-</div>
-<div class="ulist"><ul>
-<li>
-<p>
-The user is conversant with dive planning and has the necessary training to
-  perform dive planning.
-</p>
-</li>
-<li>
-<p>
-The user plans dives within his/her certification limits.
-</p>
-</li>
-<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.
-</p>
-</li>
-<li>
-<p>
-The safety of a dive plan depends heavily on the way in which the planner is
-  used.
-</p>
-</li>
-<li>
-<p>
-The user is familiar with the user interface of <em>Subsurface</em>.
-</p>
-</li>
-<li>
-<p>
-A user who is not absolutely sure about any of the above requirements should
-  not use this feature.
-</p>
-</li>
-</ul></div>
-</div></div>
-<div class="sect2">
-<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 Notes.</p></div>
-<div class="paragraph"><p>At the top right hand is a green <strong>design panel</strong> upon which the profile of
-the dive can be manipulated directly by dragging and clicking as explained
-below. This feature makes the <em>Subsurface</em> dive planner unique in ease of
-use.</p></div>
-<div class="paragraph"><p>At the bottom right is a text panel with a heading of <em>Dive Plan
-Details</em>. This is where the details of the dive plan are provided in a way
-that can easily be copied to other software. This is also where 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_f20.jpg" alt="FIGURE: Dive planner startup window" />
-</div>
-</div>
-</div>
-<div class="sect2">
-<h3 id="_open_circuit_dives">13.2. Open circuit dives</h3>
-<div class="ulist"><ul>
-<li>
-<p>
-Towards the centre bottom of the planner (circled in blue in the image
-   above) is a dropbox with three options. Select the appropriate one of these:
-</p>
-<div class="ulist"><ul>
-<li>
-<p>
-Open Circuit (the default)
-</p>
-</li>
-<li>
-<p>
-CCR
-</p>
-</li>
-<li>
-<p>
-pSCR
-</p>
-</li>
-</ul></div>
-</li>
-<li>
-<p>
-Choose the Open Circuit option.
-</p>
-</li>
-<li>
-<p>
-In the top left-hand area of the planning screen, ensure that the constant
-  dive parameters are appropriate. These are: Start date and time of the
-  intended dive, Atmospheric Pressure and Altitude above sea level of the dive
-  site. The atmospheric pressure can also be entered as an altitude in metres,
-  assuming a sea-level 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 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 right-hand of the
-  dialogue.
-</p>
-</li>
-<li>
-<p>
-The profile of the planned dive can be created in two ways:
-</p>
-<div class="ulist"><ul>
-<li>
-<p>
-Drag the waypoints (the small white circles) on the existing dive profile in
-    a way to represent the dive. Additional waypoints can be created by
-    double-clicking the existing dive profile. Waypoints can be deleted by
-    right-clicking a particular waypoint and selecting the <em>delete</em> item from
-    the resulting context menu.
-</p>
-</li>
-<li>
-<p>
-The most efficient way to create a dive profile is to enter the appropriate
-    values into the table marked <em>Dive planner points</em>. The first line of the
-    table represents the duration and the final depth of the descent from the
-    surface. Subsequent segments describe the bottom phase of the dive.  The <em>CC
-    set point</em> column is only relevant for closed circuit divers.  The ascent is
-    usually not specified because this is what the planner is supposed to
-    calculate.  Add additional segments to the profile by selecting the "+" icon
-    at the top right hand of the table. Segments entered into the <em>Dive planner
-    points</em> table automatically appear in the <strong>Dive Profile</strong> diagram.
-</p>
-</li>
-</ul></div>
-</li>
-</ul></div>
-<div class="sect3">
-<h4 id="_recreational_dives">13.2.1. Recreational dives</h4>
-<div class="paragraph"><p>Recreational mode is what comes closest to planning a dive based on the
-non-decompression limit (NDL).  It computes the maximal time a diver can
-stay at the current depth without incurring any mandatory decompression
-stops and without using more than the existing gas (minus a reserve). The
-planner automatically takes into account the nitrogen load incurred in
-previous dives. But conventional dive tables are also used in a way that can
-take into account previous dives. Why use a dive planner for recreational
-dives? Using recreational dive tables, the maximum depth of a dive is taken
-into account. However, few dives are undertaken at a constant depth
-corresponding to the maximum depth (i.e. a "square" dive profile). This
-means that dive tables overestimate the nitrogen load incurred during
-previous dives. The <em>Subsurface</em> dive planner calculates nitrogen load
-according to the real dive profiles of all uploaded previous dives, in a
-similar way as dive computers calculate nitrogen load during a dive. This
-means that the diver gets <em>credit</em> in terms of nitrogen loading for not
-remaining at maximum depth during previous dives, enabling planning of a
-longer subsequent dive. For the planner to work it is therefore crucial to
-upload all previous dives onto <em>Subsurface</em> before performing dive planning.</p></div>
-<div class="paragraph"><p>To plan a dive, the appropriate settings need to be defined.</p></div>
-<div class="paragraph"><p>Ensure that the date and time is set to that of the intended dive. This
-allows calculation of the nitrogen load incurred during previous dives.</p></div>
-<div class="ulist"><ul>
-<li>
-<p>
-Immediately under the heading <em>Planning</em> are two checkboxes <em>Recreational</em>
-  and <em>Safety Stop</em>.  Check these two boxes.
-</p>
-</li>
-<li>
-<p>
-Then define the cylinder size, the gas mixture (air or % oxygen) and the
-  starting cylinder pressure in the top left-hand section of the planner under
-  <em>Available gases</em>.
-</p>
-</li>
-<li>
-<p>
-The planner calculates whether the specified cylinder contains enough
-  air/gas to complete the planned dive. In order for this to be realistic,
-  under <em>Gas options</em>, specify an appropriate surface air consumption (SAC)
-  rate for <em>Bottom SAC</em>. Suitable values are between 15 l/min and 30 l/min,
-  with novice divers or difficult dives requiring SAC rates closer to 30l/min.
-</p>
-</li>
-<li>
-<p>
-Define the amount of gas that the cylinder must have at the end of the
-  bottom section of the dive just before ascent. A value of 50 bar is often
-  used. The reason for this reserve gas is to provide for the possible need
-  need to bring one&#8217;s buddy to the surface using gas sharing. How much gas is
-  used in sharing depends on the depth of the ascent. This can be a bit hard
-  to estimate, so most agencies assume a fixed amount of gas, or actually of
-  pressure e.g. 40 or 50 bar or 25% or 33% (rule of thirds). But <em>Subsurface</em>
-  can do better because it knows about the ascent and that is why we add the
-  amount of gas during the ascent (i.e. the "deco gas“).  Subsurface still
-  uses a fixed pressure „reserve“ but that is supposed to be for the
-  additional gas used around the realisation that there is a problem and one&#8217;s
-  pulse rate goes up when one starts to buddy breathe. This reserve amount is
-  user configurable.
-</p>
-</li>
-<li>
-<p>
-Define the depth of the dive by dragging the waypoints (white dots) on the
-  dive profile or (even better) defining the appropriate depths using the
-  table under <em>Dive planner points</em> as desribed under the previous heading. If
-  this is a multilevel dive, set the appropriate dive depths to represent the
-  dive plan by adding waypoints to the dive profile or by adding appropriate
-  dive planner points to the <em>Dive Planner Points</em> table. <em>Subsurface</em> will
-  automatically extend the bottom section of the dive to the maximum duration
-  within the no-decompression limits (NDL).
-</p>
-</li>
-<li>
-<p>
-The ascent speed can be changed. The default ascent speeds are those
-  considered safe for recreational divers.
-</p>
-</li>
-</ul></div>
-<div class="paragraph"><p>The dive profile in the planner indicates the maximum dive time within
-no-deco limits using the Bühlmann ZH-L16 algorithm and the gas and depth
-settings specified as described above. The <em>Subsurface</em> planner allows rapid
-assessment of dive duration as a function of dive depth, given the nitrogen
-load incurred during previous dives. The dive plan includes estimates of the
-amount of air/gas used, depending on the cylinder settings specified under
-<em>Available gases</em>. If the initial cylinder pressure is set to 0, the dive
-duration shown is the true no-deco limit (NDL) without taking into account
-gas used during the dive. If the surface above the dive profile is RED it
-means that recreational dive limits are exceeded and either the dive
-duration or the dive depth needs to be reduced.</p></div>
-<div class="paragraph"><p>Below is an image of a dive plan for a recreational dive at 30
-metres. Although the no-deco limit (NDL) is 23 minutes, the duration of the
-dive is limited by the amount of air in the cylinder, reflected by the
-information in the text box at the bottom right of the panel that requires
-sufficient air for buddy-sharing during the ascent.</p></div>
-<div class="imageblock" style="text-align:center;">
-<div class="content">
-<img src="images/rec_diveplan.jpg" alt="FIGURE: A recreational dive plan: setup" />
-</div>
-</div>
-</div>
-<div class="sect3">
-<h4 id="_non_recreational_open_circuit_dives_including_decompression">13.2.2. Non-recreational open circuit dives, including decompression</h4>
-<div class="paragraph"><p>Non-recreational dive planning involves exceeding the no-deco limits and/or
-using multiple breathing gases.  Such dives are planned in three stages:</p></div>
-<div class="paragraph"><p><strong>a) Nitrogen management</strong>: This is performed by specifying the rates for descent and ascent,
-as well as the deco model (GFLow, GFHigh or Conservatism level) under the headings <em>Rates</em> and <em>Planning</em>
-to the bottom left of the planning screen. Two deco models are supported the Bühlmann model and the VPM-B
-model. Select one of the two models. When selecting the Bühlmann model, the gradient factors (GF_high and GF_low
-need to be specified. Initially, the GFHigh and GFLow values in the <em>Preferences</em>
-panel of <em>Subsurface</em> is used. If these are changed within the planner (see <em>Gas Options</em> within
-the planner), the new values are
-used without changing the original values in the <em>Preferences</em>. Gradient Factor settings strongly affect the calculated ceilings and their depths.
-A very low GFLow value brings about decompression stops early on during the dive.
- ** For more information about Gradient factors, see the section on <a href="#S_GradientFactors">Gradient Factor Preference settings</a>.</p></div>
-<div class="paragraph"><p>If the VPM-B model is selected, the Conservatism_level needs to be specified
-on a scale of 0 (least conservative) to 4 (most conservative).  This model
-tends to give deco stops at deeper levels than the Bühlmann model and often
-results in slightly shorter dive durations than the Bühlmann model. When
-selecting one of these models, keep in mind that they are NOT exact
-physiological models but only mathematical models that appear to work in
-practice.</p></div>
-<div class="paragraph"><p>For more information external to this manual see:</p></div>
-<div class="ulist"><ul>
-<li>
-<p>
-<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>
-</p>
-</li>
-<li>
-<p>
-<a href="http://www.rebreatherworld.com/general-and-new-to-rebreather-articles/5037-gradient-factors-for-dummies.html">Gradient
-   factors for dummies, by Kevin Watts</a>
-<a href="http://www.amazon.com/Deco-Divers-Decompression-Theory-Physiology/dp/1905492073/ref=sr_1_1?s=books&amp;ie=UTF8&amp;qid=1403932320&amp;sr=1-1&amp;keywords=deco+for+divers"><em>Deco
-for Divers</em>, by Mark Powell (2008). Aquapress</a> Southend-on-Sea, UK. ISBN 10:
-1-905492-07-3.  Un excellent livre non technique qui traite à la fois des
-modèles de décompression Bühlmann et VPM-B.
-</p>
-</li>
-</ul></div>
-<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 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></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 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 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 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></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 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. It is NOT necessary to specify the ascent
-part of the dive since the planner calculates this, based on the settings
-that have been specified.  If any of the management limits (for nitrogen,
-oxygen or gas) is exceeded, the surface above the dive profile changes from
-BLUE to RED.</p></div>
-<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 <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. 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></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></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_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 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 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>Notes</em> section of the dive
-planner, immediately to the left of the <em>Dive Plan Details</em>. If a <em>Verbatim
-dive plan</em> is requested, a detailed sentence-level explanation of the dive
-plan is given. If any of the management specifications have been exceeded
-during the planning, a warning message is printed underneath the dive plan
-information.</p></div>
-<div class="paragraph"><p>If the option <em>Display segment duration</em> is checked, then the duration of
-each depth level is indicated in the <em>Dive Plan Details</em>. This duration
-INCLUDES the transition time to get to that level. However, if the <em>Display
-transition in deco</em> option is checked, the transitions are shown separately
-from the segment durations at a particular level.</p></div>
-</div>
-</div>
-<div class="sect2">
-<h3 id="_planning_pscr_dives">13.3. Planning pSCR dives</h3>
-<div class="paragraph"><p>To plan a dive using a passive semi-closed rebreather (pSCR), select <em>pSCR</em> rather than
-<em>Open circuit</em> in the dropdown list.
-The parameters of the pSCR dive can be set by selecting  <em>File &#8594;   Preferences &#8594;   Graph</em>
-from the main menu, where the gas consumption calculation takes into account the pSCR dump
-ratio (default 10:1) as well as the metabolism rate. The calculation also takes the oxygen drop
-accross the mouthpiece of the rebreather into account. If the
-pO<sub>2</sub> drops below what is considered a save value, a warning appears in the <em>Dive plan
-details</em>. A typical pSCR configuration is with a single cylinder and one or more bail-out
-cylinders. Therefore the setup of the <em>Available gases</em> and the <em>Dive planner points</em> tables
-are very similar to that of a CCR dive plan, described below. However, no oxygen setpoints
-are specified for pSCR dives. Below is a dive plan for a pSCR dive. The dive is comparable
-to that of the CCR dive below, but note the longer ascent duration due to the lower oxygen
-in the loop due to the oxygen drop across the mouthpiece of the pSCR equipment.</p></div>
-<div class="imageblock" style="text-align:center;">
-<div class="content">
-<img src="images/Planner_pSCR1_f20.jpg" alt="FIGURE: Planning a pSCR dive: setup" />
-</div>
-</div>
-</div>
-<div class="sect2">
-<h3 id="_planning_ccr_dives">13.4. Planning CCR dives</h3>
-<div class="paragraph"><p>To plan a dive using a closed circuit rebreather, select the <em>CCR</em> option in
-the dropdown list, circled in blue in the image below.</p></div>
-<div class="paragraph"><p><strong>Available gases</strong>: In the <em>Available gases</em> table, enter the cylinder information for the
-diluent cylinder and for any bail-out cylinders. Do NOT enter the information for the oxygen
-cylinder since it is implied when the <em>CCR</em> dropdown selection is made.</p></div>
-<div class="paragraph"><p><strong>Entering setpoints</strong>: Specify a default setpoint in the Preferences tab, by selecting <em>File &#8594;  Preferences &#8594;  Graph</em> from
-the main menu. All user-entered segments in the <em>Dive planner points</em> table
-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="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, 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">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> calculates the gas loading figures correctly and
-the effect of the first dive is evaluated on later dives.</p></div>
-<div class="paragraph"><p>If one has just completed a long/deep dive and is planning another dive,
-then highlight, in the <strong>Dive List</strong>, the dive that has just been completed
-and then activate the planner. Depending on the start time of the planned
-dive, the planner takes into account the gas loading incurred during the
-completed dive and allows planning within these limitations.</p></div>
-<div class="paragraph"><p>If only a few standard configurations are used (e.g. in GUE), then a
-template dive can be created conforming to one of the configurations. If one
-now wishes to plan a dive using this configuration, just highlight the
-template dive in the <strong>Dive List</strong> and activate the planner: the planner takes
-into account the configuration in the highlighted dive.</p></div>
-</div>
-<div class="sect2">
-<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>
-<div class="paragraph"><p>Dive plans have many characteristics in common with dive logs (dive profile,
-dive notes, etc).  After a dive plan has been saved, the dive details and
-gas calculations are saved in the <strong>Notes</strong> tab. While a dive plan is being
-designed, it can be printed using the <em>Print</em> button in the dive
-planner. This prints the dive details and gas calculations in the <em>Dive Plan
-Details</em> panel of the dive planner. However, after the plan has been saved,
-it is represented in a way very similar to a dive log and the gas
-calculations cannot be 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 or by copy and
-paste to a word processor.</p></div>
-</div>
-</div>
-</div>
-<div class="sect1">
-<h2 id="_description_des_éléments_du_menu_principal_de_subsurface">14. Description des éléments du menu principal de Subsurface</h2>
-<div class="sectionbody">
-<div class="paragraph"><p>Cette section décrit les fonctions et les opérations des éléments du menu
-principal de Subsurface. Plusieurs éléments ci-dessous sont des liens vers
-des sections de ce manuel traitant des opérations relatives.</p></div>
-<div class="sect2">
-<h3 id="_fichier">14.1. Fichier</h3>
-<div class="ulist"><ul>
-<li>
-<p>
-<a href="#S_NewLogbook"><em>Nouveau carnet de plongée</em></a> - Fermer le carnet de plongée
-  actuellement ouvert et supprime toutes les informations de plongées.
-</p>
-</li>
-<li>
-<p>
-<em>Ouvrir un carnet de plongée</em> - Cela ouvre une fenêtre pour sélectionner le
-  carnet de plongée à ouvrir.
-</p>
-</li>
-<li>
-<p>
-<em>Open cloud storage</em> - Open the dive log previously saved in
-  <a href="#S_Cloud_storage"><em>Cloud storage</em></a>.
-</p>
-</li>
-<li>
-<p>
-<em>Sauvegarder</em> - Enregistrer le carnet de plongée qui est actuellement
-  ouvert.
-</p>
-</li>
-<li>
-<p>
-<em>Save to cloud storage</em> - Save the current dive log to
-  <a href="#S_Cloud_storage"><em>Cloud storage</em></a>.
-</p>
-</li>
-<li>
-<p>
-<em>Enregsitrer sous</em> - Enregistrer le carnet actuel sous un nom différent.
-</p>
-</li>
-<li>
-<p>
-<em>Fermer</em> - Fermer le carnet de plongée actuellement ouvert.
-</p>
-</li>
-<li>
-<p>
-<a href="#S_ExportLog"><em>Exporter</em></a> - Exporter le carnet de plongée actuellement
-  ouvert (ou les plongées sélectionnées dans le carnet) vers un des nombreux
-  formats.
-</p>
-</li>
-<li>
-<p>
-<a href="#S_PrintDivelog"><em>Imprimer</em></a> - Imprimer le carnet de plongée actuellement
-  ouvert.
-</p>
-</li>
-<li>
-<p>
-<a href="#S_Preferences"><em>Préférences</em></a> - Définir les  préférences de <em>Subsurface</em>.
-</p>
-</li>
-<li>
-<p>
-<a href="#S_FindMovedImages"><em>Find moved images</em></a> - If photos taken during dives
-  have been moved to
-      a different disk or directory, locate them and link them to the appropriate
-      dives.
-</p>
-</li>
-<li>
-<p>
-<a href="#S_Configure"><em>Configurer l&#8217;ordinateur de plongée</em></a> - Modifier la
-  configuration d&#8217;un ordinateur de plongée.
-</p>
-</li>
-<li>
-<p>
-<em>Quitter</em> - Quitter <em>Subsurface</em>.
-</p>
-</li>
-</ul></div>
-</div>
-<div class="sect2">
-<h3 id="_importer">14.2. Importer</h3>
-<div class="ulist"><ul>
-<li>
-<p>
-<a href="#S_ImportDiveComputer"><em>Importer depuis un l&#8217;ordinateur de plongée</em></a> -
-  Importer des informations de plongées à partir de l&#8217;ordinateur de plongée.
-</p>
-</li>
-<li>
-<p>
-<a href="#Unified_import"><em>Importer des fichiers de log</em></a> - Importer des
-  informations de plongées à partir d&#8217;un fichier d&#8217;un format compatible avec
-  <em>Subsurface</em>.
-</p>
-</li>
-<li>
-<p>
-<a href="#S_Companion"><em>Importer les données GPS depis le service web Subsurface</em></a> -
-  Charge les coordonnées GPS à partir de l&#8217;application mobile <em>Subsurface</em>
-  (téléphones et tablettes).
-</p>
-</li>
-<li>
-<p>
-<a href="#S_ImportingDivelogsDe"><em>Importer depuis Divelogs.de</em></a> - Importer des
-  informations de plongées à partir de <em>www.Divelogs.de</em>.
-</p>
-</li>
-</ul></div>
-</div>
-<div class="sect2">
-<h3 id="_journal_log">14.3. Journal (log)</h3>
-<div class="ulist"><ul>
-<li>
-<p>
-<a href="#S_EnterData"><em>Ajouter une plongée</em></a> -  Ajouter manuellement une nouvelle
-  plongée au panneau de la <strong>liste des plongées</strong>.
-</p>
-</li>
-<li>
-<p>
-<em>Edit dive</em> - Edit a dive of which the profile was entered by hande and not
-  from a dive computer.
-</p>
-</li>
-<li>
-<p>
-<a href="#S_DivePlanner"><em>Planifier une plongée</em></a> - Cette fonctionnalité permet de
-  planifier des plongées.
-</p>
-</li>
-<li>
-<p>
-<a href="#S_Replan"><em>Modifier la plongée dans le planificateur</em></a> - Modifier une
-  plongée planifiée qui a été enregistrée dans la <strong>liste des plongées</strong>.
-</p>
-</li>
-<li>
-<p>
-<a href="#S_CopyComponents"><em>Copier les composants de la plongée</em></a> - En
-  sélectionnant cette option, vous pouvez copier les informations de plusieurs
-  champs d&#8217;un journal de plongée vers le presse-papier.
-</p>
-</li>
-<li>
-<p>
-<em>Coller les composants de la plongée</em>  - Colle, dans les plongées
-  sélectionnées dans la <strong>liste des plongées</strong>, les informations copiées au
-  préalable avec l&#8217;option <em>Copier les composants de la plongée</em>.
-</p>
-</li>
-<li>
-<p>
-<a href="#S_Renumber"><em>Renuméroter</em></a> - Renuméroter les plongées sélectionnées dans
-  le panneau de la <strong>liste des plongées</strong>.
-</p>
-</li>
-<li>
-<p>
-<a href="#S_Group"><em>Grouper automatiquement</em></a> - Grouper les plongées du panneau de
-  <strong>liste des plongées</strong> dans des voyages de plongées.
-</p>
-</li>
-<li>
-<p>
-<a href="#S_DeviceNames"><em>Editer les noms des ordinateurs de plongée</em></a> - Modifier
-  les noms des ordinateurs de plongée pour faciliter vos journaux (logs).
-</p>
-</li>
-<li>
-<p>
-<a href="#S_Filter"><em>Filtrer la liste des plongées</em></a> - Sélectionner seulement
-  certaines plongées, à partir de tags ou de critères de plongées.
-</p>
-</li>
-</ul></div>
-</div>
-<div class="sect2">
-<h3 id="_vue">14.4. Vue</h3>
-<div class="ulist"><ul>
-<li>
-<p>
-<a href="#S_ViewPanels"><em>Tout</em></a> - Affiche les quatre panneaux principaux de
-  <em>Subsurface</em> simultanément.
-</p>
-</li>
-<li>
-<p>
-<a href="#S_ViewPanels"><em>Liste des plongées</em></a> - Affiche uniquement le panneau de la
-  <strong>liste des plongées</strong>.
-</p>
-</li>
-<li>
-<p>
-<a href="#S_ViewPanels"><em>Profil</em></a> - Affiche uniquement le panneau du <strong>profil de la
-  plongée</strong>.
-</p>
-</li>
-<li>
-<p>
-<a href="#S_ViewPanels"><em>Info</em></a> - Affiche uniquement le panneau des <strong>notes</strong>.
-</p>
-</li>
-<li>
-<p>
-<a href="#S_ViewPanels"><em>Globe</em></a> - Affiche uniquement le panneau de la <strong>carte
-  mondiale</strong>.
-</p>
-</li>
-<li>
-<p>
-<em>Statistiques annuelles</em>  - Affiche par année le résumé des statistiques des
-  plongées effectuées.
-</p>
-</li>
-<li>
-<p>
-<em>Prev DC</em> - If a single dive was logged from more than one dive computer,
-  switch to data from
-   ordinateur de plongée précédent.
-</p>
-</li>
-<li>
-<p>
-<em>Ordinateur suivant</em>  - Passer à l&#8217;ordinateur de plongée suivant.
-</p>
-</li>
-<li>
-<p>
-<em>Plein écran</em>  - Passer en mode plein écran.
-</p>
-</li>
-</ul></div>
-</div>
-<div class="sect2">
-<h3 id="_share_on">14.5. Share on</h3>
-<div class="ulist"><ul>
-<li>
-<p>
-<a href="#S_Facebook"><em>Facebook</em></a> - Partager la plongée sélectionnée sur votre
-  Facebook.
-</p>
-</li>
-</ul></div>
-</div>
-<div class="sect2">
-<h3 id="_aide">14.6. Aide</h3>
-<div class="ulist"><ul>
-<li>
-<p>
-<em>À propos de Subsurface</em>  - Affiche un panneau avec le numéro de version de
-  <em>Subsurface</em> ainsi que les informations de licence.
-</p>
-</li>
-<li>
-<p>
-<em>Vérifier les mises à jour</em>  - Vérifier si une nouvelle version de
-  Subsurface est disponible sur le <a href="http://subsurface-divelog.org/">site web de
-  <em>Subsurface</em> </a>.
-</p>
-</li>
-<li>
-<p>
-<a href="#S_UserSurvey"><em>Sondge utilisateur</em></a> - Aider à rendre <em>Subsurface</em> encore
-  meilleur en répondant à notre sondage utilisateur ou en répondant à un autre
-  sondage, si vos habitudes de plongées ont changées.
-</p>
-</li>
-<li>
-<p>
-<em>Manuel utilisateur</em>  - Ouvre une fenêtre affichant ce manuel utilisateur.
-</p>
-</li>
-</ul></div>
-</div>
-</div>
-</div>
-<div class="sect1">
-<h2 id="_annexe_a_informations_spécifiques_au_système_d_8217_exploitation_utilisé_pour_importer_les_informations_de_plongées_depuis_un_ordinateur_de_plongée">15. ANNEXE A : informations spécifiques au système d&#8217;exploitation utilisé pour importer les informations de plongées depuis un ordinateur de plongée.</h2>
-<div class="sectionbody">
-<div class="sect2">
-<h3 id="_assurez_vous_que_les_pilotes_drivers_nécessaires_sont_installés">15.1. Assurez-vous que les pilotes (drivers) nécessaires sont installés</h3>
-<div class="admonitionblock">
-<table><tr>
-<td class="icon">
-<img src="images/icons/drivers.jpg" alt="Note" />
-</td>
-<td class="content">Le système d&#8217;exploitation de l&#8217;ordinateur nécessite les bons pilotes pour
-communiquer avec l&#8217;ordinateur de plongée de la façon utilisée par
-l&#8217;ordinateur de plongée (Bluetooth, USB, infra-rouge).</td>
-</tr></table>
-</div>
-<div class="ulist"><ul>
-<li>
-<p>
-Sous Linux, les utilisateurs doivent avoir le bon module noyau de chargé. La
-          plupart des distributions Linux le font automatiquement, de telle sorte que
-          l&#8217;utilisateur n&#8217;ait rien à faire de particulier. Cependant, certains
-          protocoles de communication nécessitent des pilotes additionnels, plus
-          particulièrement pour certaines technologies telles que l&#8217;infra-rouge.
-</p>
-</li>
-<li>
-<p>
-Sous Windows, le bon pilote devrait être téléchargé automatiquement la
-          première fois que l&#8217;utilisateur branche son ordinateur de plongée sur le
-          port USB de son ordinateur de bureau.
-</p>
-</li>
-</ul></div>
-<div class="paragraph"><p>Sous Mac, les utilisateurs peuvent parfois avoir besoin d&#8217;installer
-manuellement le bon pilote. Par exemple, pour le Mares Puck ou n&#8217;importe
-quel autre ordinateur de plongée utilisant une interface USB-série basé sur
-le composant Silicon Labs CP2101 ou similaire, le bon pilote est disponible
-sous <em>Mac_OSX_VCP_Driver.zip</em> sur le
-<a href="http://www.silabs.com/support/pages/document-library.aspx?p=Interface&amp;f=USB%20Bridges&amp;pn=CP2101">dépôt
-de documents et logiciels Silicon Labs</a>.</p></div>
-</div>
-<div class="sect2">
-<h3 id="S_HowFindDeviceName">15.2. Comment trouver le nom du périphérique branché sur USB et paramétrer les permissions en écriture</h3>
-<div class="admonitionblock">
-<table><tr>
-<td class="icon">
-<img src="images/icons/usb.jpg" alt="Note" />
-</td>
-<td class="content">Lorsqu&#8217;un utilisateur connecte un ordinateur de plongée en utilisant l&#8217;USB,
-généralement <em>Subsurface</em> proposera soit une liste déroulante contenant le
-bon nom (ou le point de montage pour un Uemis Zurich) ou la liste sera
-désactivée si aucun nom de périphérique n&#8217;est nécessaire. Dans les rares cas
-où cela ne fonctionnerait pas, voici quelques suggestions pour trouver le
-nom de votre périphérique ;</td>
-</tr></table>
-</div>
-<div class="paragraph"><div class="title">Sur Windows :</div><p>Essayez simplement COM1, COM2, etc. La liste déroulante devrait contenir
-tous les périphériques COM connectés.</p></div>
-<div class="paragraph"><div class="title">Sur MacOS :</div><p>La liste déroulante devrait contenir tous les ordinateurs de plongée
-connectés.</p></div>
-<div class="paragraph"><div class="title">Sur Linux :</div><p>Il existe un moyen sûr de trouver le port :</p></div>
-<div class="ulist"><ul>
-<li>
-<p>
-Déconnecter le cable USB de l&#8217;ordinateur de plongée
-</p>
-</li>
-<li>
-<p>
-Ouvrir un terminal
-</p>
-</li>
-<li>
-<p>
-Taper la commande <em>dmesg</em> et appuyer sur la touche Entrer
-</p>
-</li>
-<li>
-<p>
-Connecter le cable USB de l&#8217;ordinateur de plongée
-</p>
-</li>
-<li>
-<p>
-Taper la commande <em>dmesg</em> et appuyer sur la touche Entrer
-</p>
-</li>
-</ul></div>
-<div class="paragraph"><p>Un message similaire à celui-ci devrait apparaitre :</p></div>
-<div class="literalblock">
-<div class="content">
-<pre><code>usb 2-1.1: new full speed USB device number 14 using ehci_hcd
-usbcore: registered new interface driver usbserial
-USB Serial support registered for generic
-usbcore: registered new interface driver usbserial_generic
-usbserial: USB Serial Driver core
-USB Serial support registered for FTDI USB Serial Device
-ftdi_sio 2-1.1:1.0: FTDI USB Serial Device converter detected
-usb 2-1.1: Detected FT232BM
-usb 2-1.1: Number of endpoints 2
-usb 2-1.1: Endpoint 1 MaxPacketSize 64
-usb 2-1.1: Endpoint 2 MaxPacketSize 64
-usb 2-1.1: Setting MaxPacketSize 64
-usb 2-1.1: FTDI USB Serial Device converter now attached to ttyUSB3
-usbcore: registered new interface driver ftdi_sio
-ftdi_sio: v1.6.0:USB FTDI Serial Converters Driver</code></pre>
-</div></div>
-<div class="paragraph"><p>La troisième ligne en partant du bas montre que l&#8217;adaptateur FTDI USB est
-détecté et connecté sur <code>ttyUSB3</code>. Cette information peut à présent être
-utilisée pour les paramètres d&#8217;importation en tant que <code>/dev/ttyUSB3</code> pour
-que Subsurface utilise le bon port USB.</p></div>
-<div class="paragraph"><p>S&#8217;assurer que l&#8217;utilisateur possède les droits d'écriture sur le port série
-USB :</p></div>
-<div class="paragraph"><p>Sur les systèmes similaires à Unix, les ports USB ne peuvent être accédés
-que par des utilisateurs membres du groupe <code>dialout</code>. Si vous n'êtes pas
-root, vous n'êtes peut-être pas membre de ce groupe et ne pouvez donc pas
-utiliser le port USB. Si votre nom d&#8217;utilisateur est <em>johnB</em> :</p></div>
-<div class="paragraph"><p>En tant que root, tapez : usermod -a -G dialout johnB+ (utilisateurs
-d&#8217;Ubuntu : <code>sudo usermod -a -G dialout johnB</code>)  Cela ajoute johnB au groupe
-<code>dialout</code>.
-Tapez : <code>id johnB</code>     Cela liste tous les groupes auquel johnB appartient et
-vérifiez que
-l&#8217;appartenance au groupe est bien effectif. Le groupe <code>dialout</code> devrait
-être listé
-parmi les différents IDs.
-Sous certaines circonstances, les modifications ne prennent effet qu&#8217;après une déconnexionpuis reconnexion sur l&#8217;ordinateur (sous Ubuntu, par exemple).
-Avec le bon nom de périphérique (par exemple <code>dev/ttyUSB3</code>) et avec un accès
-en écriture au port USB, l&#8217;ordinateur de plongée devrait se connecter et
-vous devriez pouvoir importer vos plongées.</p></div>
-</div>
-<div class="sect2">
-<h3 id="S_HowFindBluetoothDeviceName">15.3. Manually setting up Bluetooth enabled devices</h3>
-<div class="admonitionblock">
-<table><tr>
-<td class="icon">
-<img src="images/icons/bluetooth.jpg" alt="Note" />
-</td>
-<td class="content">For dive computers communicating through Bluetooth like the Heinrichs
-Weikamp Frog or the Shearwater Predator and Petrel there is a different
-procedure to get the devices name to communicate with <em>Subsurface</em>. Follow
-these steps:</td>
-</tr></table>
-</div>
-<div class="ulist"><ul>
-<li>
-<p>
-<strong>For the dive computer, after enabling Bluetooth, ensure it is in Upload mode.</strong>
-</p>
-</li>
-</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>
-<div class="ulist"><ul>
-<li>
-<p>
-<strong>Pair the <em>Subsurface</em> computer with the dive computer.</strong>
-</p>
-</li>
-</ul></div>
-<div class="sect3">
-<h4 id="_sur_windows_2">15.3.1. Sur Windows :</h4>
-<div class="paragraph"><p>Bluetooth is most likely already enabled. For pairing with the dive computer
-choose <em>Control Panel &#8594; Bluetooth Devices &#8594; Add Wireless Device</em>.  This
-should bring up a dialog showing your dive computer (which should be in
-Bluetooth mode) and allowing pairing. Right click on it and choose
-<em>Properties&#8594; COM Ports</em> to identify the port used for your dive
-computer. If there are several ports listed, use the one saying "Outgoing"
-instead of "Incoming".</p></div>
-<div class="paragraph"><p>For downloading to <em>Subsurface</em>, the <em>Subsurface</em> drop-down list should
-contain this COM port already. If not, enter it manually.</p></div>
-<div class="paragraph"><p>Note: If there are issues afterwards when downloading from the dive computer
-using other software, remove the existing pairing with the dive computer.</p></div>
-</div>
-<div class="sect3">
-<h4 id="_sur_macos">15.3.2. Sur MacOS :</h4>
-<div class="paragraph"><p>Click on the Bluetooth symbol in the menu bar and select <em>Set up Bluetooth
-Device&#8230;</em>. The dive computer should then show up in the list of
-devices. Select it and go through the pairing process. This step should only
-be needed once for initial setup.</p></div>
-<div class="paragraph"><p>Once the pairing is completed the correct device is shown in the <em>Device or
-Mount Point</em> drop-down in the <em>Subsurface</em> <strong>Import</strong> dialog.</p></div>
-</div>
-<div class="sect3">
-<h4 id="_sur_linux">15.3.3. Sur Linux</h4>
-<div class="paragraph"><p>Ensure Bluetooth is enabled on the <em>Subsurface</em> computer.  On most common
-distributions this should be true out of the box and pairing should be
-straight forward. For instance, Gnome3 shows a Bluetooth icon on the right
-of the toolbar at the top of the screen.  Users have reported difficulties
-with some Bluetooth controllers.  If you have an onboard controller, try
-that first.  It is simplest if you remove any USB Bluetooth dongles.  If you
-have a USB dongle that came with your dive computer, try that before any
-others.</p></div>
-<div class="paragraph"><p>Setting up a connection to download dives from your Bluetooth-enabled
-device, such as the <em>Shearwater Petrel</em>, is not yet an automated process and
-will generally require the command prompt.  It is essentially a three step
-process.</p></div>
-<div class="ulist"><ul>
-<li>
-<p>
-Enable the Bluetooth controller and pair your dive computer
-</p>
-</li>
-<li>
-<p>
-Establish an RFCOMM connection
-</p>
-</li>
-<li>
-<p>
-Download the dives with Subsurface
-</p>
-</li>
-</ul></div>
-<div class="paragraph"><p>Ensure the dive computer is in upload mode. On the <em>Shearwater Petrel</em> and
-<em>Petrel 2</em>, cycle through the menu, select <em>Dive Log</em>, then <em>Upload Log</em>.
-The display will read <em>Initializing</em>, then <em>Wait PC 3:00</em> and will
-countdown.  Once the connection is established, the display reads <em>Wait CMD
-&#8230;</em> and the countdown continues. When downloading the dive from Subsurface,
-the display reads <em>Sending</em> then <em>Sent Dive</em>.</p></div>
-<div class="paragraph"><p>To establish the connection, establish root access through <code>sudo</code> or <code>su</code>.
-The correct permission is required to download the dives in the computer. On
-most Linux systems this means becoming a member of the dialout group (This
-is identical as for many dive computers using a Linux USB port, described in
-the previous section). On the command terminal, enter:</p></div>
-<div class="paragraph"><p><code>sudo usermod -a -G dialout username</code></p></div>
-<div class="paragraph"><p>Then log out and log in for the change to take effect.</p></div>
-<div class="sect4">
-<h5 id="_enabling_the_bluetooth_controller_and_pairing_your_dive_computer">Enabling the Bluetooth controller and pairing your dive computer</h5>
-<div class="paragraph"><p>Attempt to set up the Bluetooth controller and pair your dive computer using
-the graphical environment of the operating system. After setting the dive
-computer to upload mode, click the Bluetooth icon in the system tray and
-select <em>Add new device</em>. The dive computer should appear. If asked for a
-password, enter 0000.  Write down or copy the MAC address of your dive
-computer - this needed later and should be in the form  00:11:22:33:44:55.</p></div>
-<div class="paragraph"><p>If the graphical method didn&#8217;t work, pair the device from the command
-line. Open a terminal and use <code>hciconfig</code> to check the Bluetooth controller
-status</p></div>
-<div class="literalblock">
-<div class="content">
-<pre><code>$ hciconfig
-hci0:   Type: BR/EDR  Bus: USB
-        BD Address: 01:23:45:67:89:AB  ACL MTU: 310:10  SCO MTU: 64:8
-        *DOWN*
-        RX bytes:504 acl:0 sco:0 events:22 errors:0
-        TX bytes:92 acl:0 sco:0 commands:21 errors:0</code></pre>
-</div></div>
-<div class="paragraph"><p>This indicates a Bluetooth controller with MAC address 01:23:45:67:89:AB,
-connected as hci0.  Its status is <em>DOWN</em>, i.e. not powered.  Additional
-controllers will appear as hci1, etc.  If there is not a Bluetooth dongle
-plugged in upon booting the computer, hci0 is probably the onboard.  Now
-power on the controller and enable authentication:</p></div>
-<div class="literalblock">
-<div class="content">
-<pre><code>sudo hciconfig hci0 up auth+  (enter password when prompted)
-hciconfig
-hci0:  Type: BR/EDR  Bus: USB
-        BD Address: 01:23:45:67:89:AB  ACL MTU: 310:10  SCO MTU: 64:8
-        *UP RUNNING PSCAN AUTH*
-        RX bytes:1026 acl:0 sco:0 events:47 errors:0
-        TX bytes:449 acl:0 sco:0 commands:46 errors:0</code></pre>
-</div></div>
-<div class="paragraph"><p>Check that the status now includes <code><em>UP</em>, <em>RUNNING</em> AND <em>AUTH</em></code>.</p></div>
-<div class="paragraph"><p>If there are multiple controllers running, it&#8217;s easiest to off the unused
-controller(s). For example, for <code>hci1</code>:</p></div>
-<div class="literalblock">
-<div class="content">
-<pre><code>sudo hciconfig hci1 down</code></pre>
-</div></div>
-<div class="paragraph"><p>Next step is to <em>trust</em> and <em>pair</em> the dive computer. On distros with Bluez
-5, such as Fedora 22, one can use a tool called <code>blutootctl</code>, which will
-bring up its own command prompt.</p></div>
-<div class="literalblock">
-<div class="content">
-<pre><code>bluetoothctl
-[NEW] Controller 01:23:45:67:89:AB localhost.localdomain [default]
-[bluetooth]# agent on
-Agent registered
-[bluetooth]# default-agent
-Default agent request successful
-[bluetooth]# scan on                        &lt;----now set your dive computer to upload mode
-Discovery started
-[CHG] Controller 01:23:45:67:89:AB Discovering: yes
-[NEW] Device 00:11:22:33:44:55 Petrel
-[bluetooth]# trust 00:11:22:33:44:55        &lt;----you can use the tab key to autocomplete the MAC address
-[CHG] Device 00:11:22:33:44:55 Trusted: yes
-Changing 00:11:22:33:44:55 trust succeeded
-[bluetooth]# pair 00:11:22:33:44:55
-Attempting to pair with 00:11:22:33:44:55
-[CHG] Device 00:11:22:33:44:55 Connected: yes
-[CHG] Device 00:11:22:33:44:55 UUIDs: 00001101-0000-1000-8000-0089abc12345
-[CHG] Device 00:11:22:33:44:55 Paired: yes
-Pairing successful
-[CHG] Device 00:11:22:33:44:55 Connected: no</code></pre>
-</div></div>
-<div class="paragraph"><p>If asked for a password, enter 0000. It&#8217;s ok if the last line says
-<em>Connected: no</em>. The important part is the line above, <code>Pairing successful</code>.</p></div>
-<div class="paragraph"><p>If the system has Bluez version 4 (e.g. Ubuntu 12.04 through to 15.04),
-there is probably not a <code>bluetoothctl</code>, but a script called
-<code>bluez-simple-agent</code> or just <code>simple-agent</code>.</p></div>
-<div class="literalblock">
-<div class="content">
-<pre><code>hcitool -i hci0 scanning
-Scanning ...
-        00:11:22:33:44:55       Petrel
-        bluez-simple-agent hci0 00:11:22:33:44:55</code></pre>
-</div></div>
-<div class="paragraph"><p>Once ther dive computer is pired, set up the RFCOMM connection</p></div>
-</div>
-<div class="sect4">
-<h5 id="_establishing_the_rfcomm_connection">Establishing the RFCOMM connection</h5>
-<div class="paragraph"><p>The command to establish an RFCOMM connection is:</p></div>
-<div class="paragraph"><p><code>sudo rfcomm -i &lt;controller&gt; connect &lt;dev&gt; &lt;bdaddr&gt; [channel]</code></p></div>
-<div class="ulist"><ul>
-<li>
-<p>
-<code>&lt;controller&gt;</code> is the Bluetooth controller, <code>hci0</code>.
-</p>
-</li>
-<li>
-<p>
-<code>&lt;dev&gt;</code> is the RFCOMM device file, <code>rfcomm0</code>
-</p>
-</li>
-<li>
-<p>
-<code>&lt;bdaddr&gt;</code> is the dive computer&#8217;s MAC address, <code>00:11:22:33:44:55</code>
-</p>
-</li>
-<li>
-<p>
-<code>[channel]</code> is the dive computer&#8217;s Bluetooth channel we need to connect to.
-</p>
-</li>
-</ul></div>
-<div class="paragraph"><p>If one omits it, channel 1 is assumed.  Based on a limited number of user
-reports, the appropriate channel for the dive computer is probably:</p></div>
-<div class="ulist"><ul>
-<li>
-<p>
-<em>Shearwater Petrel 2</em>: channel 5
-</p>
-</li>
-<li>
-<p>
-<em>Shearwater Petrel 1</em>: channel 1
-</p>
-</li>
-<li>
-<p>
-<em>Heinrichs-Weikamp OSTC Sport</em>: channel 1
-</p>
-</li>
-</ul></div>
-<div class="paragraph"><p>E.g. to connect a <em>Shearwater Petrel 2</em>, set the dive computer to upload
-mode and enter:</p></div>
-<div class="literalblock">
-<div class="content">
-<pre><code>sudo rfcomm -i hci0 connect rfcomm0 00:11:22:33:44:55 5 (enter a password, probably 0000, when prompted)</code></pre>
-</div></div>
-<div class="paragraph"><p>This gives the response:</p></div>
-<div class="literalblock">
-<div class="content">
-<pre><code>Connected /dev/rfcomm0 to 00:11:22:33:44:55 on channel 5
-Press CTRL-C for hangup</code></pre>
-</div></div>
-<div class="paragraph"><p>To connect a _Shearwater Petrel 1+ or + HW OSTC Sport+, set the dive
-computer to upload mode and enter:</p></div>
-<div class="literalblock">
-<div class="content">
-<pre><code>sudo rfcomm -i hci0 connect rfcomm0 00:11:22:33:44:55   (enter a password, probably 0000, when prompted)
-Connected /dev/rfcomm0 to 00:11:22:33:44:55 on channel 1
-Press CTRL-C for hangup</code></pre>
-</div></div>
-<div class="paragraph"><p>If the specific channel the dive computer needs is not known, or the channel
-in the list above doesn&#8217;t work, the command <code>sdptool records</code> should help
-determine the appropriate channel. The output below is for a <em>Shearwater
-Petrel 2</em>.</p></div>
-<div class="literalblock">
-<div class="content">
-<pre><code>sdptool -i hci0 records 00:11:22:33:44:55
-Service Name: Serial Port
-Service RecHandle: 0x10000
-Service Class ID List:
-        "Serial Port" (0x1101)
-        Protocol Descriptor List:
-        "L2CAP" (0x0100)
-        "RFCOMM" (0x0003)
-        Channel: 5</code></pre>
-</div></div>
-<div class="paragraph"><p>For a Bluetooth dive computer not in the list above, or if the channel
-listed is not correct, please let the Subsurface developers know on the user
-forum or the developer mailing list <em>subsurface@subsurface-divelog.org</em>.</p></div>
-</div>
-<div class="sect4">
-<h5 id="_download_the_dives_with_subsurface">Download the dives with Subsurface</h5>
-<div class="paragraph"><p>After establishing the RFCOMM connection and while the dive computer&#8217;s
-upload mode countdown is still running, go to_Subsurface_, select
-<em>Import&#8594;Import from dive computer</em> and enter appropriate Vendor
-(e.g. <em>Shearwater</em>), Dive Computer (<em>Petrel</em>), Device or Mount Point
-(<em>/dev/rfcomm0</em>) and click <em>Download</em>.</p></div>
-</div>
-</div>
-</div>
-</div>
-</div>
-<div class="sect1">
-<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">16.1. Importing from Uemis Zurich</h3>
-<div class="admonitionblock">
-<table><tr>
-<td class="icon">
-<img src="images/icons/iumis.jpg" alt="Note" />
-</td>
-<td class="content"><em>Subsurface</em> downloads the information stored on the SDA (the built-in file
-system of the Uemis) including information about dive spots and
-equipment. Buddy information is not yet downloadable.  Things are very
-similar to a normal USB-connected dive computer (the Uemis is one of those
-that recharge when connected to the USB port).  The main difference is that
-one does not enter a device name, but instead the location where the
-UEMISSDA file system is mounted once connected to the dive computer. On
-Windows this is a drive letter ( often <em>E:</em> or <em>F:</em>), on a Mac this is
-<em>/Volumes/UEMISSDA</em> and on Linux systems this differs depending on the
-distribution. On Fedora it usually is
-<em>/var/run/media/&lt;your_username&gt;/UEMISSDA</em>. In all cases <em>Subsurface</em> should
-suggest the correct location in the drop down list.</td>
-</tr></table>
-</div>
-<div class="paragraph"><p>After selecting the above device name, download the dives from the Uemis
-Zurich. One technical issue with the Uemis Zurich download implementation
-(this is a Uemis firmware limitation, not a <em>Subsurface</em> issue) is that one
-cannot download more than about 40-50 dives without running out of memory on
-the SDA. This will usually only happen the very first time one downloads
-dives from the Uemis Zurich.  Normally when downloading at the end of a day
-or even after a dive trip, the capacity is sufficient. If <em>Subsurface</em>
-displays an error that the dive computer ran out of space the solution is
-straight forward.  Disconnect the SDA, turn it off and on again, and
-reconnect it. You can now retry (or start a new download session) and the
-download will continue where it stopped previously. One 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">16.2. Importing from Uwatec Galileo</h3>
-<div class="admonitionblock">
-<table><tr>
-<td class="icon">
-<img src="images/icons/Galileo.jpg" alt="Note" />
-</td>
-<td class="content">The Uwatec Galileo dive computers use infra red (IrDA) communication between
-the dive computer and Subsurface. The Uwatec hardware uses a USB dongle
-based on the serial infra-red (SIR) protocol and the MSC7780 IrDA controller
-manufactured by MosChip and marketed by Scubapro and some electronics
-companies.  Under Linux, the kernel already provides for communication using
-the IrDA protocol. However, the user additionally needs to load a driver for
-the IrDA interface with the dive computer. The easiest way is to load the
-<strong>irda-tools</strong> package from the
-<a href="http://irda.sourceforge.net/docs/startirda.html">Linux IrDA Project</a>.  After
-the installation of the irda-tools, the <strong>root user</strong> can specify a device
-name from the console as follows: <code>irattach irda0</code></td>
-</tr></table>
-</div>
-<div class="paragraph"><p>After executing this command, Subsurface will recognise the Galileo dive
-computer and download dive information.</p></div>
-<div class="paragraph"><p>Under Windows, a similar situation exists. Drivers for the MCS7780 are
-available from some Internet web sites e.g.
-<a href="http://www.drivers-download.com/Drv/MosChip/MCS7780/">www.drivers-download.com</a>.
-Windows-based IrDA drivers for the Uwatec can also be downloaded from the
-ScubaPro web site, drivers being located on the download page for the
-ScubaPro SmartTrak software.</p></div>
-<div class="paragraph"><p>For the Apple Mac, IrDA communication via the MCS7780 link is not available
-for OSX 10.6 or higher.</p></div>
-</div>
-<div class="sect2">
-<h3 id="S_ImportingDR5">16.3. Importing from Heinrichs Weikamp DR5</h3>
-<div class="admonitionblock">
-<table><tr>
-<td class="icon">
-<img src="images/icons/HW_DR5.jpg" alt="Note" />
-</td>
-<td class="content">When mounted as a USB drive the Heinrichs Weikamp DR5 saves a single UDDF
-file for every dive.  Mark all the dives you&#8217;d like to import or open.
-Note: The DR5 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 DR5.</td>
-</tr></table>
-</div>
-</div>
-<div class="sect2">
-<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_petrel_using_bluetooth">16.5. Importing from Shearwater Predator/Petrel using Bluetooth</h3>
-<div class="admonitionblock">
-<table><tr>
-<td class="icon">
-<img src="images/icons/predator.jpg" alt="Note" />
-</td>
-<td class="content">Specific instructions for downloading dives using Bluetooth are given in the
-section above, <a href="#S_Bluetooth"><em>Connecting Subsurface to a Bluetooth-enabled dive computer</em></a>.</td>
-</tr></table>
-</div>
-</div>
-<div class="sect2">
-<h3 id="S_PoseidonMkVI">16.6. Importing from Poseidon MkVI Discovery</h3>
-<div class="admonitionblock">
-<table><tr>
-<td class="icon">
-<img src="images/MkVI.jpeg" alt="Note" />
-</td>
-<td class="content">Download of dive logs from the MkVI is performed using a custom
-communications adapter and the <em>Poseidon PC Configuration Software</em>,
-obtained when purchasing the MKVI equipment. The latter is a Windows
-application allowing configuration of equipment and storage of dive
-logs. Communication between dive computer and desktop computer utilises the
-IrDA infra-red protocol. Only data for one dive can be downloaded at a time,
-comprising three files:</td>
-</tr></table>
-</div>
-<div class="ulist"><ul>
-<li>
-<p>
-Setup configuration for the dive and key dive parameters (file with a .txt
-  extension)
-</p>
-</li>
-<li>
-<p>
-Dive log details (file with a .csv extension)
-</p>
-</li>
-<li>
-<p>
-Redbook format dive log (file with .cvsr extension). This is a compressed
-  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_from_apd_inspiration_evolution_ccr">16.7. Importing from APD Inspiration/Evolution CCR</h3>
-<div class="admonitionblock">
-<table><tr>
-<td class="icon">
-<img src="images/APDComputer.jpg" alt="Note" />
-</td>
-<td class="content">The dive logs of an APD Inspiration or similar CCR dive computer are
-downloaded using a communications adapter and <em>AP Communicator</em>, obtained
-when purchasing the equipment. The dive logs can be viewed using the <em>AP Log
-Viewer</em>, within Windows or Mac/OS. However, APD logs can be viewed and
-managed from within <em>Subsurface</em> (together with dives using many other types
-of dive computer). The APD inspiration dive logs are imported into
-<em>Subsurface</em> as follows:</td>
-</tr></table>
-</div>
-<div class="ulist"><ul>
-<li>
-<p>
-Download the dive using <em>AP Communicator</em>.
-</p>
-</li>
-<li>
-<p>
-Open a dive within the <em>AP Log Viewer</em>.
-</p>
-</li>
-<li>
-<p>
-Select the tab at the top of the screen, entitled "<em>Data</em>".
-</p>
-</li>
-<li>
-<p>
-With the raw dive log data show on the screen, click on "<em>Copy to
-  Clipboard</em>".
-</p>
-</li>
-<li>
-<p>
-Open a text editor, e.g. Notepad (Windows) or TextWrangler (Mac).
-</p>
-</li>
-<li>
-<p>
-Copy the contents of the clipboard into the text editor and save the text
-  file with a filename extension of <em>.apd</em>
-</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>.
-</p>
-</li>
-<li>
-<p>
-In the dropdown list towards the bottom right of the dialogue (labled
-  <em>Filter:</em>), select "APD log viewer".
-</p>
-</li>
-<li>
-<p>
-On the list of file names select the <em>.apd</em> file that has been created
-  above. An import dialogue opens indicating the default settings for the data
-  in the <em>.apd</em> file. If any changes are required, do this as for
-  <a href="#S_ImportingCSVDives">CSV imports</a>.
-</p>
-</li>
-</ul></div>
-<div class="imageblock" style="text-align:center;">
-<div class="content">
-<img src="images/APD_CSVimportF22.jpg" alt="Figure: APD log viewer import" />
-</div>
-</div>
-<div class="ulist"><ul>
-<li>
-<p>
-The top left hand dropdown box in the import panel allows one to select the
-  APD dive computer for which the dive log needs to be imported. The default
-  it is DC1, <em>i.e.</em> the first of the two dive computers the APD uses. It is
-  possible to sequentially import the data for both dive computers by first
-  importing CD1 and then DC2.(<strong>Hint</strong>: The logs for the two dive computers are
-  viewed by selecting <em>View &#8594; Next DC</em> from the Main Menu after the uploading
-  has been completed)
-</p>
-</li>
-<li>
-<p>
-Click the <em>Ok</em> button at the bottom of the import panel.
-</p>
-</li>
-</ul></div>
-<div class="paragraph"><p>The APD dive log will appear within <em>Subsurface</em>. The dive
-computer-generated ceiling generated by the Inspiration can be viewed by
-selecting the appropriate button on the left of the <strong>Dive Profile</strong>. Cylinder
-pressure data are not logged by the APD equipment but can be manually
-entered in the <em>Equipment</em> Tab.</p></div>
-</div>
-</div>
-</div>
-<div class="sect1">
-<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 the dialogue found by selecting <em>Import</em> from the Main Menu,
-then clicking on <em>Import Log Files</em>. This is a single-step process, more
-information about which can be found <a href="#Unified_import">here.</a> However, in
-some cases, a two-step process may be required:</p></div>
-<div class="olist arabic"><ol class="arabic">
-<li>
-<p>
-Export the foreign dive log data to format that is accessible from
-  <em>Subsurface</em>.
-</p>
-</li>
-<li>
-<p>
-Import the accessible dive log data into <em>Subsurface</em>.
-</p>
-</li>
-</ol></div>
-<div class="paragraph"><p>This appendix provides some information about approaches to export dive log
-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">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 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>
-<div class="paragraph"><p><strong>Divemanager 3 (DM3):</strong></p></div>
-<div class="olist arabic"><ol class="arabic">
-<li>
-<p>
-Start <em>Suunto Divemanager 3</em> and log in with the name containing the logs
-</p>
-</li>
-<li>
-<p>
-Do not start the import wizard to import dives from the dive computer.
-</p>
-</li>
-<li>
-<p>
-In the navigation tree on the left side of the program-window, select the
-   appropriate dives.
-</p>
-</li>
-<li>
-<p>
-Within the list of dives, select the dives you would like to import later:
-</p>
-<div class="ulist"><ul>
-<li>
-<p>
-To select certain dives: hold <em>ctrl</em> and click the dive
-</p>
-</li>
-<li>
-<p>
-To select all dives: Select the first dive, hold down shift and select the
-          last dive
-</p>
-</li>
-</ul></div>
-</li>
-<li>
-<p>
-With the dives marked, use the program menu <em>File &#8594; Export</em>
-</p>
-</li>
-<li>
-<p>
-The export pop-up will show. Within this pop-up, there is one field called
-   <em>Export Path</em>.
-</p>
-<div class="ulist"><ul>
-<li>
-<p>
-Click the browse button next to the field Export Path
-</p>
-<div class="ulist"><ul>
-<li>
-<p>
-A file-manager like window pops up
-</p>
-</li>
-<li>
-<p>
-Navigate to the directory for storing the
-   Divelog.SDE file
-</p>
-</li>
-<li>
-<p>
-Optionally change the name of the file for saving
-</p>
-</li>
-<li>
-<p>
-Click <em>Save</em>
-</p>
-</li>
-</ul></div>
-</li>
-<li>
-<p>
-Back in the Export pop-up, press the button <em>Export</em>
-</p>
-</li>
-</ul></div>
-</li>
-<li>
-<p>
-The dives are now exported to the file Divelog.SDE.
-</p>
-</li>
-</ol></div>
-<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 (or DM5) database:</p></div>
-<div class="olist arabic"><ol class="arabic">
-<li>
-<p>
-Start Suunto DM4/DM5
-</p>
-</li>
-<li>
-<p>
-Select <em>Help &#8594; About</em>
-</p>
-</li>
-<li>
-<p>
-Click <em>Copy</em> after text <em>Copy log folder path to clipboard</em>
-</p>
-</li>
-<li>
-<p>
-Now open Windows Explorer
-</p>
-</li>
-<li>
-<p>
-Paste the address to the path box at the top of the File Explorer
-</p>
-</li>
-<li>
-<p>
-The database is called DM4.db or DM5.db
-</p>
-</li>
-</ol></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/DM5
-</p>
-</li>
-<li>
-<p>
-Select <em>File - Create backup</em>
-</p>
-</li>
-<li>
-<p>
-From the file menu select the location and name for the backup, we&#8217;ll use
-   DM4 (or DM5) in here with the default extension .bak
-</p>
-</li>
-<li>
-<p>
-Click <em>Save</em>
-</p>
-</li>
-<li>
-<p>
-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_atomic_logbook">17.2. Exporting from Atomic Logbook</h3>
-<div class="admonitionblock" id="Atomic_Export">
-<table><tr>
-<td class="icon">
-<img src="images/icons/atomiclogo.jpg" alt="Note" />
-</td>
-<td class="content">Atomic Logbook is a Windows software by Atomic Aquatics. It allows
-downloading of dive information from Cobalt and Cobalt 2 dive computers.
-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">
-<img src="images/icons/mareslogo.jpg" alt="Note" />
-</td>
-<td class="content">Mares Dive Organiser is a Windows application. The dive log is kept as a
-Microsoft SQL Compact Edition database with a <em>.sdf</em> filename extension. The
-database includes all Dive Organiser-registered divers on the particular
-computer and all Mares dive computers used. The safest way to obtain a copy
-of the dive database is to export the information to another compatible
-format which can be imported into <em>Subsurface</em>.</td>
-</tr></table>
-</div>
-<div class="olist arabic"><ol class="arabic">
-<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.
-</p>
-</li>
-<li>
-<p>
-Rename the file to DiveOrganiserxxxxx.zip. Inside the zipped directory is a
-   file <em>DiveOrganiser.sdf</em>.
-</p>
-</li>
-<li>
-<p>
-Extract the <em>.sdf</em> file from the zipped folder to your Desktop.
-</p>
-</li>
-<li>
-<p>
-The password for accessing the .zip file is <em>mares</em>.
-</p>
-</li>
-</ol></div>
-</div>
-<div class="sect2">
-<h3 id="S_ImportingDivingLog">17.4. Exporting from <strong>DivingLog 5.0 and 6.0</strong></h3>
-<div class="admonitionblock">
-<table><tr>
-<td class="icon">
-<img src="images/icons/divingloglogo.jpg" alt="Note" />
-</td>
-<td class="content">The best way to bring your logs from DivingLog to Subsurface is to convert
-the whole database. This is because other export formats do not include all
-the details, and we would lack e.g. gas switches and information of what
-units are used. With database import, all this information is included and
-readily available for us.</td>
-</tr></table>
-</div>
-<div class="paragraph"><p>To transfer all files from DivingLog to Subsurface, do the following:</p></div>
-<div class="olist arabic"><ol class="arabic">
-<li>
-<p>
-In DivingLog open the <em>File &#8594; Export &#8594; SQLite</em> menu
-</p>
-</li>
-<li>
-<p>
-Select <em>Settings</em> button
-</p>
-</li>
-<li>
-<p>
-Set the <em>RTF2Plaintext</em> to <em>true</em>
-</p>
-</li>
-<li>
-<p>
-Close the Settings dialog
-</p>
-</li>
-<li>
-<p>
-Click <em>Export</em> button and select the filename
-</p>
-</li>
-</ol></div>
-<div class="paragraph"><p>Once this is done, open the saved database file with Subsurface and the
-dives are automatically converted to our own format. Last step to do is save
-the log file in Subsurface.</p></div>
-</div>
-</div>
-</div>
-<div class="sect1">
-<h2 id="_annexe_d_exporter_un_tableur_vers_le_format_csv">18. ANNEXE D : Exporter un tableur vers le format CSV</h2>
-<div class="sectionbody">
-<div class="paragraph" id="S_Appendix_D"><p>De nombreux plongeurs conservent un carnet de plongée sous forme de fichier
-numérique, souvent un tableur avec différents champs et informations. Ces
-données peuvent facilement être importées dans <em>Subsurface</em> après que le
-tableur a été converti en fichier CSV. Cette section explique la procedure
-pour convertir un carnet de plongée enregistrée sous forme de tableur vers
-un fichier CSV qui pourra ensuite être importé dans <em>Subsurface</em>. Créer un
-fichier CSV est une tache simple malgré que la procédure soit différente
-selon le tableur utilisé.</p></div>
-<div class="paragraph"><p>La première étape est d&#8217;organiser les données de plongées dans le tableur
-pour que la première ligne contienne le nom (ou le titre) de chaque colonne
-et que les informations de chaque plongée soient contenues sur une seule
-ligne. <em>Subsurface</em> supporte de nombreux éléments (Dive #, Date, Time,
-Duration, Location, GPS, Max Depth, Mean Depth, Buddy, Notes, Weight et
-Tags). L&#8217;utilisateur peut organiser les données de plongées selon quelques
-règles simples :</p></div>
-<div class="olist arabic"><ol class="arabic">
-<li>
-<p>
-Date : utiliser un des formats suivants : aaaa-mm-jj, jj.mm.aaaa, mm/jj/aaaa
-</p>
-</li>
-<li>
-<p>
-Durée : le format est minutes:secondes.
-</p>
-</li>
-<li>
-<p>
-Système d&#8217;unité : un seul système d&#8217;unité doit être utilisé (pas de mélange
-   entre les unités impériales et métriques)
-</p>
-</li>
-<li>
-<p>
-Étiquettes et équipiers : les valeurs doivent être séparées par des
-   virgules.
-</p>
-</li>
-<li>
-<p>
-Position GPS : vous devez utiliser les degrés décimaux, par exemple :
-   30.22496 30.821798
-</p>
-</li>
-</ol></div>
-<div class="sect2">
-<h3 id="_em_libreoffice_calc_em_et_em_openoffice_calc_em">18.1. <em>LibreOffice Calc</em> et <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: <strong> In Windows 7, click the <em>Formats</em> tab, and then
-  click <em>Customize this format</em>.  </strong> In Windows XP, click the <em>Regional
-  Options</em> tab, and then click <em>Customize</em>.
-</p>
-</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="S_APPENDIX_E">19. ANNEXE E : Créer un modèle d&#8217;impression personnalisé</h2>
-<div class="sectionbody">
-<div class="paragraph"><p><em>Subsurface</em> provides a mechanism to create or modify templates for printing
-dive logs in order to produce customised printouts of dive logs. Templates,
-written in HTML as well as a simple Grantlee instruction set, are rendered
-to the print device by <em>Subsurface</em>.</p></div>
-<div class="paragraph"><p>Templates are accessed using the print dialogue (see image <strong>B</strong> below).</p></div>
-<div class="imageblock" style="text-align:center;">
-<div class="content">
-<img src="images/Print1_f22.jpg" alt="FIGURE: Print dialogue" />
-</div>
-</div>
-<div class="paragraph"><p>The buttons under the <em>Template</em> dropdown box allows one to <em>Edit</em>,
-<em>Delete</em>, <em>Import</em> and to <em>Export</em> templates (see image <strong>A</strong> above). New or
-modified templates are stored as HTML files in the same directory as the
-dive log being processed. In order to create or modify a template, select
-one of the templates from the template dropdown list in the print dialogue
-(see image <strong>B</strong> above). Choose an existing template that resembles the final
-desired printout. Then select <em>Edit</em>.</p></div>
-<div class="paragraph"><p>The Edit Panel comprises three tabs:</p></div>
-<div class="imageblock" style="text-align:center;">
-<div class="content">
-<img src="images/Template1_f22.jpg" alt="FIGURE: template edit dialogue" />
-</div>
-</div>
-<div class="paragraph"><p>1) The <em>Style</em> tab (image <strong>A</strong> above) controls the font, line spacing and colour
-   template used for printing the dive log.  The style attributes are
-   editable. Choose one of the four colour palets used for colour printing.</p></div>
-<div class="paragraph"><p>2) The <em>Colors</em> tab (image <strong>B</strong> above) allows editing the colours used for
-   printing the dive log. The colours are highly customisable: the <em>Edit</em>
-   buttons in the <em>Colors</em> tab allows choosing abritrary colours for different
-   components of the dive log printout.</p></div>
-<div class="paragraph"><p>3) The <em>Template</em> tab of the Edit Panel (see image below) allows creating a
-   template using HTML as well as a few Grantlee programming
-   primitives. Grantlee provides the ability to create and format HTML code in
-   a highly simple but efficient way (see below). The HTML of the template can
-   be edited and saved. The saved template is stored in the same directory as
-   the dive being processed. By default, a <em>Custom</em> template is a skeleton with
-   no specific print instructions. The informastion being printed needs to be
-   specified and formatted in the by replacing the section marked with: "&lt;!--
-   Template must be filled -&#8594;". Writing HTML code with Grantlee instructions
-   allows unlimited freedom in determining what is printed an in which way it
-   should be rendered.</p></div>
-<div class="imageblock" style="text-align:center;">
-<div class="content">
-<img src="images/Template2_f22.jpg" alt="FIGURE:Template tab" />
-</div>
-</div>
-<div class="paragraph"><p>One can adapt any of the existing templates and save it to the dive log
-directory. The standard templates (e.g. One dive, Six dives, Table) can be
-modified in this way. After completing the edits, use the <em>Export</em> button in
-the print dialogue to save the new template using a new template name.</p></div>
-<div class="paragraph"><p>To write a custom template the following elements must exist so that the
-template will be correctly handled and rendered.</p></div>
-<div class="sect2">
-<h3 id="_main_dive_loop">19.1. Main dive loop</h3>
-<div class="paragraph"><p><em>Subsurface</em> exports a dive list called (<strong>dives</strong>) to the <em>Grantlee</em>
-backend. It is possible to iterate over the list as follows:</p></div>
-<div class="literalblock">
-<div class="title">template.html</div>
-<div class="content">
-<pre><code>        {% for dive in dives %}
-                &lt;h1&gt; {{ dive.number }} &lt;/h1&gt;
-        {% endfor %}</code></pre>
-</div></div>
-<div class="literalblock">
-<div class="title">output.html</div>
-<div class="content">
-<pre><code>        &lt;h1&gt; 1 &lt;/h1&gt;
-        &lt;h1&gt; 2 &lt;/h1&gt;
-        &lt;h1&gt; 3 &lt;/h1&gt;</code></pre>
-</div></div>
-<div class="paragraph"><p>Additional information about <em>Grantlee</em> can be found
-<a href="http://www.grantlee.org/apidox/for_themers.html">here</a></p></div>
-</div>
-<div class="sect2">
-<h3 id="_grantlee_exported_variables">19.2. Grantlee exported variables</h3>
-<div class="paragraph"><p>Only a subset of the dive data is exported:</p></div>
-<div class="tableblock">
-<table rules="all"
-width="100%"
-frame="border"
-cellspacing="0" cellpadding="4">
-<col width="50%" />
-<col width="50%" />
-<tbody>
-<tr>
-<td align="left" valign="top"><p class="table"><strong>Name</strong></p></td>
-<td align="left" valign="top"><p class="table"><strong>Description</strong></p></td>
-</tr>
-<tr>
-<td align="left" valign="top"><p class="table">number</p></td>
-<td align="left" valign="top"><p class="table">(<strong>int</strong>) dive number</p></td>
-</tr>
-<tr>
-<td align="left" valign="top"><p class="table">id</p></td>
-<td align="left" valign="top"><p class="table">(<strong>int</strong>) unique dive ID, should be used to fetch the dive profile</p></td>
-</tr>
-<tr>
-<td align="left" valign="top"><p class="table">date</p></td>
-<td align="left" valign="top"><p class="table">(<strong>string</strong>) data of the dive</p></td>
-</tr>
-<tr>
-<td align="left" valign="top"><p class="table">time</p></td>
-<td align="left" valign="top"><p class="table">(<strong>string</strong>) time of the dive</p></td>
-</tr>
-<tr>
-<td align="left" valign="top"><p class="table">location</p></td>
-<td align="left" valign="top"><p class="table">(<strong>string</strong>) location of the dive</p></td>
-</tr>
-<tr>
-<td align="left" valign="top"><p class="table">duration</p></td>
-<td align="left" valign="top"><p class="table">(<strong>string</strong>) duration of the dive</p></td>
-</tr>
-<tr>
-<td align="left" valign="top"><p class="table">depth</p></td>
-<td align="left" valign="top"><p class="table">(<strong>string</strong>) depth of the dive</p></td>
-</tr>
-<tr>
-<td align="left" valign="top"><p class="table">divemaster</p></td>
-<td align="left" valign="top"><p class="table">(<strong>string</strong>) divemaster data</p></td>
-</tr>
-<tr>
-<td align="left" valign="top"><p class="table">buddy</p></td>
-<td align="left" valign="top"><p class="table">(<strong>string</strong>) buddy data</p></td>
-</tr>
-<tr>
-<td align="left" valign="top"><p class="table">airTemp</p></td>
-<td align="left" valign="top"><p class="table">(<strong>string</strong>) air temperature of dive</p></td>
-</tr>
-<tr>
-<td align="left" valign="top"><p class="table">waterTemp</p></td>
-<td align="left" valign="top"><p class="table">(<strong>string</strong>) water temperature of dive</p></td>
-</tr>
-<tr>
-<td align="left" valign="top"><p class="table">notes</p></td>
-<td align="left" valign="top"><p class="table">(<strong>string</strong>) dive notes</p></td>
-</tr>
-<tr>
-<td align="left" valign="top"><p class="table">rating</p></td>
-<td align="left" valign="top"><p class="table">(<strong>int</strong>) dive rating ranges from 0 to 5</p></td>
-</tr>
-<tr>
-<td align="left" valign="top"><p class="table">sac</p></td>
-<td align="left" valign="top"><p class="table">(<strong>string</strong>) sac value</p></td>
-</tr>
-<tr>
-<td align="left" valign="top"><p class="table">tags</p></td>
-<td align="left" valign="top"><p class="table">(<strong>string</strong>) all dive tags concatenate together</p></td>
-</tr>
-<tr>
-<td align="left" valign="top"><p class="table">gas</p></td>
-<td align="left" valign="top"><p class="table">(<strong>string</strong>) used gas cylinder</p></td>
-</tr>
-</tbody>
-</table>
-</div>
-<div class="paragraph"><p><em>Subsurface</em> also exports <strong>template_options</strong> data. This data must be used as
-<em>CSS</em> values to provide a dynamically editable template. The exported data
-is shown in the following table:</p></div>
-<div class="tableblock">
-<table rules="all"
-width="100%"
-frame="border"
-cellspacing="0" cellpadding="4">
-<col width="50%" />
-<col width="50%" />
-<tbody>
-<tr>
-<td align="left" valign="top"><p class="table"><strong>Name</strong></p></td>
-<td align="left" valign="top"><p class="table"><strong>Description</strong></p></td>
-</tr>
-<tr>
-<td align="left" valign="top"><p class="table">font</p></td>
-<td align="left" valign="top"><p class="table">(<strong>string</strong>) font family</p></td>
-</tr>
-<tr>
-<td align="left" valign="top"><p class="table">borderwidth</p></td>
-<td align="left" valign="top"><p class="table">(<strong>int</strong>) border-width value dynamically calculated as 0.1% of the page width with minimum value of 1px</p></td>
-</tr>
-<tr>
-<td align="left" valign="top"><p class="table">font_size</p></td>
-<td align="left" valign="top"><p class="table">(<strong>double</strong>) size of fonts in vw, ranges between 1.0 and 2.0</p></td>
-</tr>
-<tr>
-<td align="left" valign="top"><p class="table">line_spacing</p></td>
-<td align="left" valign="top"><p class="table">(<strong>double</strong>) distance between text lines, ranges between 1.0 and 3.0</p></td>
-</tr>
-<tr>
-<td align="left" valign="top"><p class="table">color1</p></td>
-<td align="left" valign="top"><p class="table">(<strong>string</strong>) background color</p></td>
-</tr>
-<tr>
-<td align="left" valign="top"><p class="table">color2</p></td>
-<td align="left" valign="top"><p class="table">(<strong>string</strong>) primary table cell color</p></td>
-</tr>
-<tr>
-<td align="left" valign="top"><p class="table">color3</p></td>
-<td align="left" valign="top"><p class="table">(<strong>string</strong>) secondary table cell color</p></td>
-</tr>
-<tr>
-<td align="left" valign="top"><p class="table">color4</p></td>
-<td align="left" valign="top"><p class="table">(<strong>string</strong>) primary text color</p></td>
-</tr>
-<tr>
-<td align="left" valign="top"><p class="table">color5</p></td>
-<td align="left" valign="top"><p class="table">(<strong>string</strong>) secondary text color</p></td>
-</tr>
-<tr>
-<td align="left" valign="top"><p class="table">color6</p></td>
-<td align="left" valign="top"><p class="table">(<strong>string</strong>) border colors</p></td>
-</tr>
-</tbody>
-</table>
-</div>
-<div class="literalblock">
-<div class="title">template.html</div>
-<div class="content">
-<pre><code>        border-width: {{ template_options.borderwidth }}px;</code></pre>
-</div></div>
-<div class="literalblock">
-<div class="title">output.html</div>
-<div class="content">
-<pre><code>        border-width: 3px;</code></pre>
-</div></div>
-<div class="paragraph"><p>Another variable that <em>Subsurface</em> exports is <strong>print_options</strong>. This variable
-contains a single member:</p></div>
-<div class="tableblock">
-<table rules="all"
-width="100%"
-frame="border"
-cellspacing="0" cellpadding="4">
-<col width="50%" />
-<col width="50%" />
-<tbody>
-<tr>
-<td align="left" valign="top"><p class="table"><strong>Name</strong></p></td>
-<td align="left" valign="top"><p class="table"><strong>Description</strong></p></td>
-</tr>
-<tr>
-<td align="left" valign="top"><p class="table">grayscale</p></td>
-<td align="left" valign="top"><p class="table">Use <em>CSS</em> filters to convert the page into grayscale (should be added to body style to enable printing grayscale prints)</p></td>
-</tr>
-</tbody>
-</table>
-</div>
-<div class="literalblock">
-<div class="title">template.html</div>
-<div class="content">
-<pre><code>        body {
-                {{ print_options.grayscale }};
-        }</code></pre>
-</div></div>
-<div class="literalblock">
-<div class="title">output.html</div>
-<div class="content">
-<pre><code>        body {
-                -webkit-filter: grayscale(100%);
-        }</code></pre>
-</div></div>
-</div>
-<div class="sect2">
-<h3 id="_defined_css_selectors">19.3. Defined CSS selectors</h3>
-<div class="paragraph"><p>As the dive profile is placed after rendering, <em>Subsurface</em> uses a special
-<em>CSS</em> selectors to do some searches in the HTML output. The <em>CSS</em> selectors
-in the following table should be added.</p></div>
-<div class="tableblock">
-<table rules="all"
-width="100%"
-frame="border"
-cellspacing="0" cellpadding="4">
-<col width="33%" />
-<col width="33%" />
-<col width="33%" />
-<tbody>
-<tr>
-<td align="left" valign="top"><p class="table"><strong>Selector</strong></p></td>
-<td align="left" valign="top"><p class="table"><strong>Type</strong></p></td>
-<td align="left" valign="top"><p class="table"><strong>Description</strong></p></td>
-</tr>
-<tr>
-<td align="left" valign="top"><p class="table">dive_{{ dive.id }}</p></td>
-<td align="left" valign="top"><p class="table">id</p></td>
-<td align="left" valign="top"><p class="table">is used to fetch the relevant dive profile</p></td>
-</tr>
-<tr>
-<td align="left" valign="top"><p class="table">diveProfile</p></td>
-<td align="left" valign="top"><p class="table">class</p></td>
-<td align="left" valign="top"><p class="table">each div that will contain a dive profile should have this class selector in addition to the dive_{{ dive.id }} id selector</p></td>
-</tr>
-<tr>
-<td align="left" valign="top"><p class="table">dontbreak</p></td>
-<td align="left" valign="top"><p class="table">class</p></td>
-<td align="left" valign="top"><p class="table">prevents the div with this class to be divided into two pages, this can be used
-in flow layout templates only (when data-numberofdives = 0)</p></td>
-</tr>
-</tbody>
-</table>
-</div>
-<div class="admonitionblock">
-<table><tr>
-<td class="icon">
-<img src="./images/icons/important.png" alt="Important" />
-</td>
-<td class="content">Rendering dive profiles is not supported for flow layout templates (when
-data-numberofdives = 0).</td>
-</tr></table>
-</div>
-</div>
-<div class="sect2">
-<h3 id="_special_attributes">19.4. Special attributes</h3>
-<div class="paragraph"><p>There are two ways of rendering- either rendering a specific number of dives
-in each page or make <em>Subsurface</em> try to fit as much dives as possible into
-one page (<em>flow</em> rendering).</p></div>
-<div class="paragraph"><p>The <strong>data-numberofdives</strong> data attribute is added to the body tag to set the
-rendering mode</p></div>
-<div class="ulist"><ul>
-<li>
-<p>
-render 6 dives per page:
-</p>
-</li>
-</ul></div>
-<div class="literalblock">
-<div class="content">
-<pre><code>        &lt;body data-numberofdives = 6&gt;</code></pre>
-</div></div>
-<div class="ulist"><ul>
-<li>
-<p>
-render as much dives as possible:
-</p>
-</li>
-</ul></div>
-<div class="literalblock">
-<div class="content">
-<pre><code>        &lt;body data-numberofdives = 0&gt;</code></pre>
-</div></div>
-<div class="admonitionblock">
-<table><tr>
-<td class="icon">
-<img src="./images/icons/important.png" alt="Important" />
-</td>
-<td class="content">All CSS units should be in relative lengths only, to support printing on any
-page size.</td>
-</tr></table>
-</div>
-</div>
-</div>
-</div>
-<div class="sect1">
-<h2 id="_appendix_f_faqs">20. APPENDIX F: FAQs.</h2>
-<div class="sectionbody">
-<div class="sect2">
-<h3 id="S_APPENDIX_F">20.1. Subsurface appears to miscalculate gas consumption and SAC</h3>
-<div class="paragraph" id="SAC_CALCULATION"><p><em>Question</em>: I dived with a 12.2 l tank, starting with 220 bar and ending
-with 100 bar, and I calculate a different SAC compared what <em>Subsurface</em>
-calculates. Is <em>Subsurface</em> miscalculating?</p></div>
-<div class="paragraph"><p><em>Answer</em>: Not really. What happens is that <em>Subsurface</em> actually calculates
-gas consumption differently - and better - than you expect.  In particular,
-it takes the incompressibility of the gas into account.  Traditionally, Gas
-consumption and SAC should be: <code>consumption = tank size x (start pressure -
-end pressure)</code></p></div>
-<div class="paragraph"><p>and that&#8217;s true for an ideal gas, and it&#8217;s what you get taught in dive
-theory.  But an "ideal gas" doesn&#8217;t actually exist, and real gases actually
-don&#8217;t compress linearly with pressure. Also, you are missing the fact that
-one atmosphere of pressure isn&#8217;t actually one bar.  So the <strong>real</strong>
-calculation is:</p></div>
-<div class="paragraph"><p><code>consumption = (amount_of_air_at_beginning - amount_of_air_at_end)</code></p></div>
-<div class="paragraph"><p>where the amount of air is <strong>not</strong> just "tank size times pressure in bar".
-It&#8217;s a combination of: "take compressibility into account" (which is a
-fairly small issue under 220 bar - you&#8217;ll see more differences when you do
-high-pressure tanks with 300bar) and "convert bar to atm" (which is the
-majority of your discrepancy).  Remember: one ATM is ~1.013 bar, so without
-the compressibility, your gas use is:</p></div>
-<div class="paragraph"><p><code>12.2*((220-100)/1.013)</code></p></div>
-<div class="paragraph"><p>which is about 1445, not 1464. So there was 19 l too much in your simple
-calculation that ignored the difference between 1 bar and one ATM.  The
-compressibility does show up above 200 bar, and takes that 1445 down about
-eight litres more, so you really did use only about 1437 l of air at surface
-pressure.</p></div>
-<div class="paragraph"><p>So be happy: your SAC really is better than your calculations indicated.  Or
-be sad: your cylinder contains less air than you thought it did.  And as
-mentioned, the "contains less air than you thought it did" really 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">20.2. Some dive profiles have time discrepancies with the recorded samples from my dive computer&#8230;</h3>
-<div class="paragraph"><p><em>Subsurface</em> ends up ignoring surface time for many things (average depth,
-divetime, SAC, etc).  <em>Question</em>: Why do dive durations in my dive computer
-differ from that given by <em>Subsurface</em>?</p></div>
-<div class="paragraph"><p><em>Answer</em>: For example, if you end up doing a weight check (deep enough to
-trigger the "dive started")  but then come back up and wait five minutes for
-your buddies, your dive computer may say that your dive is 50 minutes long -
-because you have fifty minutes worth of samples - but 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>
-</div>
-<div class="sect2">
-<h3 id="_some_dive_profiles_are_missing_from_the_download">20.3. Some dive profiles are missing from the download</h3>
-<div class="paragraph" id="DC_HISTORY"><p><em>Question</em>: I cannot download all my dives, only the most recent ones even
-though my dive computer&#8217;s manual states that it records history of e.g. 999
-dives.</p></div>
-<div class="paragraph"><p><em>Answer</em>: Dive history is different than the dive profiles on the log.  The
-history only keeps track of the total number of dives and total amount of
-time spent below surface. The logs, on the other hand, store the dive
-profile, but they have limited amount of memory to do so. The exact amount
-of dive profiles that can be stored on the device depend on sample interval
-and duration of the dives. Once the memory is full the oldest dives get
-overwritten with new dives. Thus we are only able to download the last 13,
-30 or 199 dives.</p></div>
-<div class="paragraph"><p>If you have downloaded your dives to different dive logging software before
-they were overwritten, there is a high chance that Subsurface can import
-these. However, if the logs are only on your dive computer, they cannot be
-salvaged after being over written by new dives.</p></div>
-</div>
-</div>
-</div>
-</div>
-<div id="footnotes"><hr /></div>
-<div id="footer">
-<div id="footer-text">
-Last updated 2015-10-13 20:41:46 CEST
-</div>
-</div>
-</body>
-</html>
+subsurface.bin</code></pre>
+</div></div>
+<div class="paragraph"><p>These files should be send to the <em>Subsurface</em> mail list:
+<em>subsurface@subsurface-divelog.org</em> with a request for the files to be
+analysed. Provide the dive computer make and model as well as contextual
+information about the dives recorded on the dive computer.</p></div>
+</div></div>
+</div>
+<div class="sect3">
+<h4 id="S_Bluetooth">5.2.2. Connecting <em>Subsurface</em> to a Bluetooth-enabled dive computer</h4>
+<div class="paragraph"><p>Bluetooth is becoming a more common way of communication between dive
+computers and <em>Subsurface</em>, for instance, the Shearwater Petrel Mk2 and the
+OSTC Mk3. <em>Subsurface</em> provides a largely operating system independent
+Bluetooth interface. Setting up <em>Subsurface</em> for Bluetooth communication
+requires four steps:</p></div>
+<div class="ulist"><ul>
+<li>
+<p>
+Ensure that Bluetooth is activated on the host computer running
+  <em>Subsurface</em>.
+</p>
+</li>
+<li>
+<p>
+Ensure that <em>Subsurface</em> sees the Bluetooth adapter on the host computer.
+</p>
+</li>
+<li>
+<p>
+Ensure the Bluetooth-enabled dive computer is Bluetooth-discoverable and in
+  PC upload mode.
+</p>
+</li>
+<li>
+<p>
+Ensure that <em>Subsurface</em> is paired with the Bluetooth-enabled dive computer.
+</p>
+</li>
+</ul></div>
+<div class="paragraph"><p>Select the Download dialogue by selecting <em>Import &#8594; Import from dive
+computer</em> from the <strong>Main Menu</strong>. If one checks the check box labelled
+<em>"Choose Bluetooth download mode"</em>, the dialogue below appears.</p></div>
+<div class="sect4">
+<h5 id="_sur_linux_ou_macos">Sur Linux ou MacOS :</h5>
+<div class="imageblock" style="text-align:center;">
+<div class="content">
+<img src="images/DC_import_Bluetooth.jpg" alt="FIGURE: Download Bluetooth" />
+</div>
+</div>
+<div class="paragraph"><p>On the <em>Linux</em> or <em>MacOS</em> platforms the name of the <em>Subsurface</em> computer
+and its Bluetooth address are shown on the right-hand side, On the lefthand
+side, if the computer has connected more than one local Bluetooth devices
+the user can use the list box to indicate which one needs to connect to
+<em>Subsurface</em>.  The power state (on/off) of the Bluetooth adapter is shown
+below the address and can be changed by checking the <em>Turn on/off</em> check
+box.</p></div>
+<div class="paragraph"><p>If the Bluetooth address is not shown, then <em>Subsurface</em> does not see the
+local Bluetooth device. Ensure that the Bluetooth driver is installed
+correctly on the <em>Subsurface</em> computer and check if it can be used by other
+Bluetooth utilities like <em>bluetoothctl</em> or <em>bluemoon</em>. This achieves the
+first two steps above.</p></div>
+<div class="paragraph"><p>Ensure that the Bluetooth-enabled dive computer is in PC-upload mode and
+that it is discoverable by other Bluetooth devices. Consult the manual of
+the dive computer to perform this. Now the third item in the list above has
+been achieved.</p></div>
+<div class="paragraph"><p>Select the <em>Scan</em> button towards the bottom left of the dialogue
+above. After searching for a small amount of time, the dive computer should
+be listed (perhaps as one of a number of Bluetooth devices) in the main list
+box on the lefthand side of the dialogue (see image above). If this is not
+achieved, select the <em>Clear</em> button and then scan again for Bluetooth
+devices using the <em>Scan</em> button. After performing these actions <em>Subsurface</em>
+should see the dive computer.  The label of the discovered dive computer
+contains the name of the device, its address and its pairing status. If the
+device is not paired and has a red background colour, a context menu can be
+opened by selecting the item with a right-click.  Select the the <em>Pair</em>
+option and wait for the task to complete.</p></div>
+<div class="sidebarblock">
+<div class="content">
+<div class="admonitionblock">
+<table><tr>
+<td class="icon">
+<img src="images/icons/important.png" alt="Important" />
+</td>
+<td class="content">Currently <em>Subsurface</em> does not support Bluetooth pairing with dive
+computers that require a custom PIN code. In order to pair the devices, use
+other OS utilities as suggested below.</td>
+</tr></table>
+</div>
+<div class="paragraph"><p>One way to achieve this is to use <code>bluetoothctl</code>:</p></div>
+<div class="literalblock">
+<div class="content">
+<pre><code>$ bluetoothctl
+[bluetooth]# agent KeyboardOnly
+Agent registered
+[bluetooth]# default-agent
+Default agent request successful
+[bluetooth]# pair 00:80:25:49:6C:E3
+Attempting to pair with 00:80:25:49:6C:E3
+[CHG] Device 00:80:25:49:6C:E3 Connected: yes
+Request PIN code
+[agent] Enter PIN code: 0000</code></pre>
+</div></div>
+</div></div>
+<div class="paragraph"><p>After the devices are paired the <em>Save</em> button of the dialogue can be
+pressed.  This closes the Bluetooth dialogue. Now select <em>Download</em> in the
+<em>Download from dive computer</em> dialogue which should still be open. The
+downloaded dives are shown on the righthand side of the download dialogue.</p></div>
+</div>
+<div class="sect4">
+<h5 id="_sur_windows">Sur Windows :</h5>
+<div class="imageblock" style="text-align:center;">
+<div class="content">
+<img src="images/DC_import_Bluetooth_Windows.png" alt="FIGURE: Download Bluetooth on Windows" />
+</div>
+</div>
+<div class="paragraph"><p>On <em>Windows</em> platforms the <em>Local Bluetooth device details section</em> on the
+right is not displayed.  To successfully initiate a scan (by pressing the
+<em>Scan</em> button)  check that the Bluetooth device on the <em>Subsurface</em> computer
+is turned on.</p></div>
+<div class="paragraph"><p>The pairing step is checked and done automatically during the download
+process. If the devices have never been paired the system will ask for your
+permissions and put a message on the right side of the screen: <em>Add a
+device, Tap to set up your DC device</em>. Always allow this pairing. After a
+discovered item is selected, select the <em>Save</em> button.  Finally select the
+<em>Download</em> button on the <em>Download</em> dialogue and wait for the process to
+complete.</p></div>
+<div class="admonitionblock">
+<table><tr>
+<td class="icon">
+<img src="images/icons/important.png" alt="Important" />
+</td>
+<td class="content">Be aware that currently <em>Subsurface</em> works only with local Bluetooth
+adapters which use Microsoft Bluetooth Stack. If the local device uses
+<em>Widcomm</em>, <em>Stonestreet One Bluetopia Bluetooth</em> or <em>BlueSolei</em> drivers it
+will definitely not work.</td>
+</tr></table>
+</div>
+<div class="paragraph"><p>A log messageOn the bottom left of the <em>Remote Bluetooth device selection</em>
+shows details about the current status of the Bluetooth agent. To select
+another dive computer for download using the "Remote Bluetooth selection
+dialogue" press the three-dots button from the <em>"Choose Bluetooth download
+mode"</em> option.</p></div>
+<div class="admonitionblock">
+<table><tr>
+<td class="icon">
+<img src="images/icons/important.png" alt="Important" />
+</td>
+<td class="content"><strong>IN CASE OF PROBLEMS</strong>:  If the Bluetooth adapter from the <em>Subsurface</em> computer
+gets stuck and the <em>Download</em> process fails repeatedly,
+ <em>unpair</em> the devices and then repeat the above steps. If this is not successful,
+ <a href="#S_HowFindBluetoothDeviceName"><em>Appendix A</em></a> contains
+information for manually setting up and inspecting the Bluetooth connection
+with <em>Subsurface</em>.</td>
+</tr></table>
+</div>
+</div>
+</div>
+<div class="sect3">
+<h4 id="S_DeviceNames">5.2.3. Changing the name of a dive computer</h4>
+<div class="paragraph"><p>It may be necessary to distinguish between different dive computers used to
+upload dive logs to <em>Subsurface</em>. For instance if one&#8217;s partner&#8217;s dive
+computer is the same make and model as one&#8217;s own and dive logs are uploaded
+from both dive computers to the same <em>Subsurface</em> computer, then one would
+perhaps like to call one dc "Alice&#8217;s Suunto D4" and the other one "Bob&#8217;s
+Suunto D4". Alternatively, consider a technical diver dives with two or more
+dive computers of the same model, the logs of both (or all) being uploaded.
+In this case it might be prudent to call one of them "Suunto D4 (1)" and
+another one "Suunto D4 (2)". This is easily done in <em>Subsurface</em>.  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">5.2.4. Updating the dive information imported from the dive computer.</h4>
+<div class="paragraph"><p>With the uploaded dives in the <strong>Dive List</strong>, the information from the dive
+computer is not complete and more details must be added in order to have a
+fuller record of the dives. To do this, the <strong>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 class="sect4">
+<h5 id="S_Notes_dc">Notes</h5>
+<div class="paragraph"><p>To have a more complete dive record the user needs to add additional
+information by hand. The procedure below is virtually identical for
+hand-entered dives and for dives downloaded from a dive computer.</p></div>
+<div class="paragraph"><p>In some cases, one has to provide the date and time of the dive, e.g. when
+entering a dive by hand or when a dive computer does not provide the date
+and time of the dive.  (Usually the date and time of the dive, gas mixture
+and water temperature are shown as obtained from the dive computer)  If the
+contents of the <strong>Notes tab</strong> is changed or edited in any way, the message in
+a blue box at the top of the panel indicates that the dive is being
+edited. If one clicks on the <strong>Notes</strong> tab, the following fields are visible
+(left hand image, below):</p></div>
+<div class="imageblock" style="text-align:center;">
+<div class="content">
+<img src="images/AddDive3_f22.jpg" alt="FIGURE: The Notes tab" />
+</div>
+</div>
+<div class="paragraph"><p>The right hand image, above, shows a <strong>Notes tab</strong> filled with dive
+information.  The <strong>Time</strong> field reflects the date and time of the dive. By
+clicking the date, a calendar is displayed from which one can choose the
+correct date. Press ESC to close the calendar.  The time values (hour and
+minutes) can also be edited directly by clicking on each of them in the text
+box and by over-typing the information displayed.</p></div>
+<div class="paragraph"><p><strong>Air/water temperatures</strong>: Air and water temperatures during the dive are shown
+in text boxes to the right of the Start time. Many dive computers supply water
+temperature information and this box may therefore contain information.
+If air temperature is not provided by the dive computer, the first temperature reading
+might be used for the air temperature. Generally this is close enough to the real air temperature as
+the change in the temperature sensor reading is quite slow to follow the changes in the environment.
+If editing is required, only a value is required, the units of temperature will be
+automatically supplied by
+<em>Subsurface</em> (following the <em>Preferences</em>, metric or imperial units will
+be used).</p></div>
+<div class="paragraph"><p><strong>Location</strong>:</p></div>
+<div class="admonitionblock">
+<table><tr>
+<td class="icon">
+<img src="images/icons/warning2.png" alt="Warning" />
+</td>
+<td class="content">Dive locations are managed as a <strong>separate</strong> part of the dive log.  The dive
+information in the <strong>Notes</strong> and <strong>Equipment</strong> tabs can therefore not be edited
+at the same time as the dive site information. Save all the other dive
+information (e.g.  divemaster, buddy, protective gear, notes about the dive)
+by selecting <em>Apply changes</em> on the <strong>Notes</strong> tab before editing the dive site
+information. Only then, supply a dive site name in the textbox labelled
+<em>Location</em> on the <strong>Notes</strong> tab.</td>
+</tr></table>
+</div>
+<div class="paragraph"><p>Type the name of the dive site, e.g. "Tihany, Lake Balaton, Hungary".  If
+several dives are performed at the same location, the dive site information
+for the first dive is re-used.  Existing dive location information can be
+edited at any time by selecting (on the <strong>Dive List</strong> panel) a dive performed
+at that site and by opening the location information by clicking the globe
+button on the right of the location name (see image on the right,
+above). When entering a dive location name, auto location of dive site names
+makes it easy to select an existing dive site name (i.e. when typing the
+name of a dive site, a dropdown list appears showing all sites with similar
+names). If the dive site has been used before, click on the already-existing
+name.  The dive site names in the dropdown list contain either a globe
+symbol (indicating existing dive sites in the <em>Subsurface</em> database)  or a
+<strong>+</strong> symbol (indicating dive site names that appear consistent with the
+current dive site name but which have not been added to the dive site
+database).  Therefore, if the present dive site has not been used before, a
+message appears as follows (image <strong>A</strong> below):</p></div>
+<div class="imageblock" style="text-align:center;">
+<div class="content">
+<img src="images/Locations1_f22.jpg" alt="FIGURE:Location description panel" />
+</div>
+</div>
+<div class="paragraph"><p>Doubleclick on the new dive site name. A panel appears to enter the
+coordinates and other important information about the site (image <strong>B</strong>,
+above). The most important items are the coordinates of the site. There are
+three ways of specifying the coordinates:</p></div>
+<div class="olist loweralpha"><ol class="loweralpha">
+<li>
+<p>
+One can find the coordinates on the world map in the bottom right hand part
+   of the <em>Subsurface</em> window. The map displays an orange bar indicating "No
+   location data - Move the map and double-click to set the dive
+   location". Upon a doubleclick at the appropriate place, the orange bar
+   disappears and the coordinates are stored.
+</p>
+</li>
+<li>
+<p>
+The coordinates can be obtained from the <em>Subsurface</em> Companion app if the
+   user has an Android or iPhone device with GPS and if the coordinates of the
+   dive site were stored using that device.  <a href="#S_Companion">Click here for
+   more information</a>
+</p>
+</li>
+<li>
+<p>
+The coordinates can be entered by hand if they are known, using one of four
+   formats with latitude followed by longitude:
+</p>
+<div class="literalblock">
+<div class="content">
+<pre><code>ISO 6709 Annex D format e.g. 30°13'28.9"N 30°49'1.5"E Degrees and decimal
+minutes, e.g. N30° 13.49760' , E30° 49.30788' Degrees minutes seconds,
+e.g. N30° 13' 29.8" , E30° 49' 1.5" Decimal degrees, e.g. 30.22496 ,
+30.821798</code></pre>
+</div></div>
+</li>
+</ol></div>
+<div class="paragraph"><p>Southern hemisphere latitudes are given with a <strong>S</strong>, e.g. S30°, or with a
+negative value, e.g. -30.22496. Similarly western longitudes are given with
+a <strong>W</strong>, e.g. W07°, or with a negative value, e.g. -7.34323. Some keyboards
+don&#8217;t have the degree sign (°). It can be replaced by a <strong>d</strong> like this: N30d
+W20d.  If both a dive site name and coordinates have been provided, Save the
+dive site information by selecting the button <em>Apply changes</em> at the top of
+the panel.</p></div>
+<div class="paragraph"><p><strong>Important</strong>: GPS coordinates of a dive site are linked to the Location
+name - so <strong>saving</strong> a dive site with only coordinates and no dive site name
+causes unexpected behaviour (Subsurface will think that all of these
+dives have the same location and try to keep their GPS coordinates the
+same).</p></div>
+<div class="paragraph"><p><strong>Dive site name lookup:</strong> If coordinates have been typed into the appropriate
+text box, one can perform an automated name lookup based on the coordinates.
+This is achieved when <em>Subsurface</em> uses the Internet to find the name of the dive site
+based on the coordinates that were typed. If a name has been found, it is
+automatically inserted into the tags box. The list box
+(Titled <em>Dive sites on same coordinates</em>") at the bottom
+of the dive site panel contains the names of other dives sites used at the
+current location. For instance if the dive site is "Blue Hole" and there are several
+dive sites named "Blue Hole", all these sites are listed in this list box.</p></div>
+<div class="paragraph"><p>Enter any other textual information about the dive site (Description and
+Notes), then select <em>Apply Changes</em> to save the geolocation for this dive
+site. At a later stage the dive site information can be edited by clicking
+the globe icon to the right of the dive site name in the <strong>Notes tab</strong>.</p></div>
+<div class="paragraph"><p><strong>Dive mode</strong>: This is a dropdown box allowing one to choose the type of dive
+performed. The options are OC (Open Circuit SCUBA, the default seting, meant for most recreational dives),
+Freedive (dive without SCUBA equipment), CCR (Closed-circuit
+rebreather) and pSCR (Passive semi-closed rebreather).</p></div>
+<div class="paragraph"><p><strong>Divemaster</strong>: The name of the dive master or dive guide for this dive should be
+entered in this field
+which offers auto selection based on the list of dive masters in
+the current logbook.</p></div>
+<div class="paragraph"><p><strong>Buddy</strong>: In this field, one enters the name(s) of the buddy / buddies
+(separated with commas) who accompanied him/her on the
+dive. Auto selection based on the list of buddies in the current logbook is
+offered.</p></div>
+<div class="paragraph"><p><strong>Suit</strong>: Here the type of dive suit used can be entered.
+Auto selection of the suit description is available.
+Some dry-suit users may choose to use this field to record what combination of
+suit and thermal undersuit was used.</p></div>
+<div class="paragraph"><p><strong>Rating</strong>: One can provide a subjective overall rating of the dive on a
+5-point scale by clicking the appropriate star on the rating scale.</p></div>
+<div class="paragraph"><p><strong>Visibility</strong>: Similarly, one can provide a rating of visibility during the
+dive on a
+5-point scale by clicking the appropriate star.</p></div>
+<div class="paragraph"><p><strong>Tags</strong>: Tags that describe the type of dive performed can be entered
+here (separated by commas). Examples of common tags are boat, drift, training,
+cave, etc.
+<em>Subsurface</em> has many built-in tags. If the user starts typing a tag, the
+program
+will list the tags that correspond to the typing. For instance, if the user
+typed
+<code>cav</code>, then the tags <strong>cave</strong> and <strong>cavern</strong> are shown for the user to choose from.</p></div>
+<div class="paragraph"><p><strong>Notes</strong>: Any additional information for the dive can be entered here.</p></div>
+<div class="paragraph"><p>The <em>Apply changes</em> and <em>Discard changes</em> buttons are used to save all the
+information for tabs in the <strong>Info</strong> panel and in the <strong>Dive Profile</strong> panel, so
+there&#8217;s no need to use them until <strong>ALL</strong> other information has been
+added. The image <a href="#S_Notes_dc">at the beginning of this section</a> shows an
+example of a <strong>Notes tab</strong> after completion of the dive information.</p></div>
+</div>
+<div class="sect4">
+<h5 id="_equipment">Equipment</h5>
+<div class="paragraph"><p>The Equipment tab allows one to enter information about the type of cylinder
+and gas used as well as the weights used for the dive. The message in a blue
+box at the top of the panel:</p></div>
+<div class="imageblock" style="text-align:center;">
+<div class="content">
+<img src="images/BlueEditBar_f22.jpg" alt="FIGURE: Blue edit bar" />
+</div>
+</div>
+<div class="paragraph"><p>indicates that the dive is being edited. This is a highly interactive part
+of <em>Subsurface</em> and the information on cylinders and gases (entered here)
+determines the behaviour of the <strong>Dive profile</strong> (top right-hand panel).</p></div>
+<div class="paragraph" id="cylinder_definitions"><p><strong>Cylinders</strong>: The cylinder information is entered through a dialogue that looks
+like this:</p></div>
+<div class="imageblock" style="text-align:center;">
+<div class="content">
+<img src="images/DC_gas-dialogue1_f20.jpg" alt="FIGURE: Initial cylinder dialogue" />
+</div>
+</div>
+<div class="paragraph"><p>For hand-entered dives, this information needs to be typed in. For dive
+computers, <em>Subsurface</em> often obtains the gas used from the dive computer
+and automatically inserts the gas composition(% oxygen or % helium) in the
+table. The + button at the top right allows the user to add more cylinders
+for this dive. The dark dustbin icon on the left allows the deletion of
+information for a cylinder.  Note that it is not possible to delete a
+cylinder if it is used during the dive. A cylinder might be implicitly used
+in the dive, even without a gas change event.</p></div>
+<div class="paragraph"><p>The user should start by selecting a cylinder type on the left-hand side of
+the table.  To select a cylinder, the <em>Type</em> box should be clicked. This
+brings up a list button that can be used to display a dropdown list of
+cylinders:</p></div>
+<div class="imageblock" style="text-align:center;">
+<div class="content">
+<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 for this dive or the user may start typing in the box which shows the
+available options for the entered characters. The <strong>Size</strong> of the cylinder as
+well as its working pressure (<em>Work.press</em>) will automatically be shown in
+the dialogue.</p></div>
+<div class="paragraph"><p>Next, indicate the starting pressure and the ending pressure of the
+specified gas during the dive. The unit of pressure (metric/imperial)
+corresponds to the settings chosen in the <em>Preferences</em>.</p></div>
+<div class="paragraph"><p>Finally, provide the gas mixture used. If air was used, the value of 21% can
+be entered or this field can be left blank. If nitrox or trimix were used,
+their percentages of oxygen and/or helium should be entered.  Any
+inappropriate fields should be left empty. After typing the information for
+the cylinder, save the data either by pressing <em>ENTER</em> on the keyboard or by
+clicking outside the cell containing the cursor. Information for any
+additional cylinders can be added by using the + 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_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
+using a dialogue very similar to that of the cylinder information. If one
+clicks
+the + button on the top right of the weights dialogue, the table looks like
+this:</p></div>
+<div class="imageblock" style="text-align:center;">
+<div class="content">
+<img src="images/WeightsDataEntry1_f20.jpg" alt="FIGURE:The Weights dialogue" />
+</div>
+</div>
+<div class="paragraph"><p>By clicking on the <em>Type</em> field, a drop-down list becomes accessible through
+a down-arrow:</p></div>
+<div class="imageblock" style="text-align:center;">
+<div class="content">
+<img src="images/WeightsDataEntry2_f20.jpg" alt="FIGURE:Weights type drop-down list button" />
+</div>
+</div>
+<div class="paragraph"><p>This can be used to select the type of weight system used during the dive or
+the user may start typing in the box to specify a different weighting
+mechanism that will be saved by <em>Subsurface</em>.  In the <strong>Weight</strong> field, type
+in the amount of weight used during the dive. After specifying the weight
+system, save the data by either pressing <em>ENTER</em> on the keyboard or by
+clicking outside the cell with the cursor.  It is possible to enter
+information for more than one weight system by adding an additional system
+using the + button on the top right hand. Weight systems can be deleted
+using the dustbin icon on the left hand. Here is an example of information
+for a dive with two types of weights: integrated as well as a weight belt:</p></div>
+<div class="imageblock" style="text-align:center;">
+<div class="content">
+<img src="images/WeightsDataEntry3_f20.jpg" alt="FIGURE: A completed weights information table" />
+</div>
+</div>
+</div>
+</div>
+<div class="sect3">
+<h4 id="_editing_several_selected_dives_simultaneously">5.2.5. Editing several selected dives simultaneously</h4>
+<div class="paragraph"><p><em>METHOD 1</em>: After uploading dives from a dive computer, the dive profiles of
+each uploaded dive is shown in the <strong>Dive profile</strong> tab, as well as a few
+items of information in the <strong>Notes</strong> tab (e.g. water temperature) and in the
+<strong>Equipment</strong> tab (e.g. gas pressures and gas composition). However the other
+fields remain empty.  It may be useful to simultaneously edit some of the
+fields in the <strong>Notes</strong> and <strong>Equipment</strong> tabs.  For instance, it is possible
+that a diver performed several dives during a single day, using identical
+equipment while diving at the same dive site or with the same dive master
+and/or buddy or tags. Instead of completing the information for each of
+these dives separately, one can select all the dives for that day in the
+<strong>Dive List</strong> and insert the same information in the <strong>Notes</strong> and <strong>Equipment</strong>
+fields that need identical information. This is achieved by editing the dive
+notes or the equipment for any one of the selected dives.</p></div>
+<div class="paragraph"><p>The simultaneous editing only works with fields that do not already contain
+information.  This means that, if some fields have been edited for a
+particular dive among the selected dives, these are not changed while
+editing the dives simultaneously. Technically, the rule for editing several
+dives simultaneously is: if the data field being edited contains <em>exactly
+the same information</em> for all the dives that have been selected, the new,
+edited information is substituted for all the selected dives, otherwise only
+the 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>Notes</strong> and
+<strong>Equipment</strong> tabs. Then, from the main menu, select <em>Log &#8594; Copy dive
+components</em>.  A box is presented with a selection of check boxes for most of
+the fields in the <strong>Notes</strong> and <strong>Equipment</strong> tabs.  Select the fields to be
+copied from the currently selected dive, then select <em>OK</em>. Now, in the <strong>Dive
+List</strong>, select the dives into which this information is to be pasted. Then,
+from the main menu, select <em>Log &#8594; Paste dive components</em>.  All the selected
+dives now contain the data initially selected in the original source dive
+log.</p></div>
+</div>
+<div class="sect3">
+<h4 id="_adding_bookmarks_to_a_dive">5.2.6. Adding Bookmarks to a dive</h4>
+<div class="paragraph"><p>Many divers wish to annotate their dives with text that indicate particular
+events during the dive, e.g. "Saw dolphins", or "Released surface
+buoy". This is easily done:</p></div>
+<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).
+</p>
+</li>
+<li>
+<p>
+Right-click on the red flag. This brings up the context menu (see <strong>B</strong>
+   below). Select <em>Edit name</em>.
+</p>
+</li>
+<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.
+</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).
+</p>
+</li>
+</ul></div>
+<div class="imageblock" style="text-align:center;">
+<div class="content">
+<img src="images/Bookmarks.jpg" alt="FIGURE: Bookmark dialog" />
+</div>
+</div>
+</div>
+<div class="sect3">
+<h4 id="_saving_the_updated_dive_information">5.2.7. Saving the updated dive information</h4>
+<div class="paragraph"><p>The information entered in the <strong>Notes</strong> tab and the <strong>Equipment</strong> tab can be
+saved by using the two buttons on the top right hand of the <strong>Notes</strong> tab. If
+the <em>Apply changes</em> button is clicked, the dive data are saved in the memory
+image of the dive. If the <em>Discard changes</em> button is clicked, then the
+newly entered dive data are erased from the computer memory, although the
+dive profile is retained. When the user exits <em>Subsurface</em> there is a final
+prompt to confirm that the new data should now be saved permanently on the
+computer disk.</p></div>
+</div>
+</div>
+<div class="sect2">
+<h3 id="_importer_les_informations_à_partir_d_8217_autres_sources_de_données_numériques_ou_d_8217_autres_formats_de_données">5.3. Importer les informations à partir d&#8217;autres sources de données numériques ou d&#8217;autres formats de données</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 imported into
+<em>Subsurface</em>. <em>Subsurface</em> will import dive logs from a range of other dive
+log software. While some software is supported natively, for others the user
+has to export the logbook(s) to an intermediate format so that they can then
+be imported by <em>Subsurface</em>.  Currently, <em>Subsurface</em> supports importing CSV
+log files from several sources.  APD LogViewer, XP5, Sensus and Seabear
+files are preconfigured, but because the import is flexible, users can
+configure their own imports.  Manually kept log files (e.g. a spreadsheet)
+can also be imported by configuring the CSV import.  <em>Subsurface</em> can also
+import UDDF and UDCF files used by some divelog software and some dive
+computers, like the Heinrichs &amp; Weikamp DR5. Finally, for some divelog
+software like Mares Dive Organiser it is currently suggested to import the
+logbooks first into a webservice like <em>divelogs.de</em> and then import 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 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 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. Below follows more specific information to achieve data import to
+<em>Subsurface</em>.</p></div>
+<div class="sect3">
+<h4 id="_using_the_universal_import_dialogue">5.3.1. Using the universal import dialogue</h4>
+<div class="paragraph" id="Unified_import"><p>Importing dives from other software is performed through a universal
+interface activated by selecting <em>Import</em> from the Main Menu, then clicking
+on <em>Import Log Files</em>. This brings up dialogue <strong>A</strong>, below.</p></div>
+<div class="imageblock" style="text-align:center;">
+<div class="content">
+<img src="images/Import1_f20.jpg" alt="FIGURE: Import dialogue: step 1" />
+</div>
+</div>
+<div class="paragraph"><p>Towards the bottom right is a dropdown selector with a default label of
+<em>Dive Log Files</em> which gives access to the different types of direct imports
+available, as in dialogue <strong>B</strong>, above. Currently these are:</p></div>
+<div class="ulist"><ul>
+<li>
+<p>
+XML-formatted dive logs (DivingLog 5.0, MacDive and several other dive log
+   systems)
+</p>
+</li>
+<li>
+<p>
+Cochran dive logs
+</p>
+</li>
+<li>
+<p>
+UDDF-formatted dive logs (e.g. Kenozoooid)
+</p>
+</li>
+<li>
+<p>
+UDCF-formatted dive logs
+</p>
+</li>
+<li>
+<p>
+Poseidon MkVI CCR logs
+</p>
+</li>
+<li>
+<p>
+APD Inspiration/Evolution CCR logs
+</p>
+</li>
+<li>
+<p>
+LiquiVision logs
+</p>
+</li>
+<li>
+<p>
+divelog.de logs
+</p>
+</li>
+<li>
+<p>
+OSTC Tools logs
+</p>
+</li>
+<li>
+<p>
+JDiveLog
+</p>
+</li>
+<li>
+<p>
+Suunto Dive Manager (DM3 and DM4)
+</p>
+</li>
+<li>
+<p>
+CSV (text-based and spreadsheet-based) dive logs, including APD CCR logs
+</p>
+</li>
+</ul></div>
+<div class="paragraph"><p>Selecting the appropriate format and then the specific log file in the large
+window containing the file list on the right of the dialogue opens the
+imported dive log in the <em>Subsurface</em> <strong>Dive List</strong>. Some other formats, not
+accessible through the Import dialogue are also supported, as explained
+below.</p></div>
+</div>
+<div class="sect3">
+<h4 id="_importing_from_ostctools">5.3.2. Importing from  OSTCTools</h4>
+<div class="paragraph"><p><em>OSTC Tools</em> is a Microsoft-based suite of dive download and dive management
+tools for the OSTC family of dive computers. <em>OSTC Tools</em> downloads dive
+data from the dive computer and stores it as a binary file with file
+extension <em>.dive</em> . Subsurface can directly import these files when using
+the universal import dialogue. From the dropdown list at the bottom right
+select <em>OSTCTools Files (.dive .DIVE)</em>. This makes the <em>OSTC Tools</em> dive
+logs visible in the file list panel. Select one or more dive, then click the
+<em>Open</em> button. The OSTC dives are shown in the <strong>Dive List</strong> panel.</p></div>
+<div class="paragraph"><p>Actually, all H&amp;W devices supported by OSTCTools can be imported to
+<em>Subsurface</em>, this includes OSTC, OSTC Mk2, OSTC 2N/2C, OSTC3, OSTC Sport,
+and probably although untested, Frog, OSTC2 and OSTC CR.</p></div>
+<div class="paragraph"><p>Please, remember that OSTCTools is <strong>not</strong> a true diving log software, but a
+useful set of tools for analysis and management of OSTC devices. This way,
+only raw dive computer data will be performed with the import to
+<em>Subsurface</em>; one has to to manually complete the rest of data which may be
+important (buddies, equipment, notes, etc).</p></div>
+</div>
+<div class="sect3">
+<h4 id="_importing_from_mares_dive_organiser_v2_1">5.3.3. Importing from Mares Dive Organiser V2.1</h4>
+<div class="paragraph"><p>Since Mares utilise proprietary Windows software not compatible with
+multi-platform applications, these dive logs cannot be directly imported
+into <em>Subsurface</em>. Mares dive logs need to be imported using a three-step
+process, using <em>www.divelogs.de</em> as a mechanism to extract the dive log
+information.</p></div>
+<div class="olist arabic"><ol class="arabic">
+<li>
+<p>
+Export the dive log data from Mares Dive Organiser to the user&#8217;s desktop,
+   using a <em>.sdf</em> file name extension. Refer to <a href="#Mares_Export">Appendix C</a>
+   for more information.
+</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>.
+</p>
+</li>
+<li>
+<p>
+Finally, import the dives 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">5.3.4. Importing dives from <strong>divelogs.de</strong></h4>
+<div class="paragraph"><p>The import of dive information from <em>divelogs.de</em> is simple, using a single
+dialogue box. The <em>Import &#8594; Import from Divelogs.de</em> option should be
+selected from the Main Menu. This brings up a dialogue box (see image <strong>A</strong>
+below). Enter a user-ID and password for <em>divelogs.de</em> into the appropriate
+fields and then select the <em>Download</em> button. Download from <em>divelogs.de</em>
+starts immediately, displaying a progress bar in the dialogue box. At the
+end of the download, the success status is indicated (see image <strong>B</strong>,
+below). The <em>Apply</em> button should then be selected, after which the imported
+dives appear in the <em>Subsurface</em> <strong>Dive List</strong> panel.</p></div>
+<div class="imageblock" style="text-align:center;">
+<div class="content">
+<img src="images/Divelogs1.jpg" alt="FIGURE:Download from Divelogs.de" />
+</div>
+</div>
+</div>
+<div class="sect3">
+<h4 id="S_ImportingCSVData">5.3.5. Importer des données au format CSV</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">Importer les plongées au format CSV à partir des ordinateurs de plongées ou d&#8217;autres logiciels de carnet de plongée</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>
+<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>
+<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>
+</li>
+</ol></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 field separator should be either a comma (,) a semicolon (;) or a
+   TAB character.  This can be determined by opening the file with a text
+   editor. If it is comma-delimited or semicolon-delimited, the comma or
+   semicolon characters between the values are clearly visible. If these are
+   not evident and the numbers are aligned in columns, the file is probably
+   TAB-delimited (i.e. it uses a TAB as a field separator).
+</p>
+</li>
+<li>
+<p>
+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>
+Is the numeric information (e.g. dive depth) in metric or in imperial units?
+</p>
+</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> (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 blue row of the data table contains the
+column headings found in the <em>CSV</em> data file. The blue row of balloons
+immediately above these contains the names understood by <em>Subsurface</em>. These
+balloons can be moved using a drag-and-drop action. For instance,
+<em>Subsurface</em> expects the column heading for Dive number (" # ") to be "Dive
+# ". If the column heading that <em>Subsurface</em> expects is not in the blue row,
+then drag the appropriate balloon from the upper area and drop it in the
+appropriate blue cell at the top of the table. To indicate the correct
+column for "Dive #", drag the ballooned item 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/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 of the dialogue.  The data from the <em>CSV</em> file are imported and shown
+in the <strong>Dive List</strong> panel.</p></div>
+<div class="sidebarblock" id="S_CSV_Intro">
+<div class="content">
+<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
+Values</em>. It is a file format allowing someone to view or edit the
+information using a text editor such as Notepad (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>The above data are not easily read by a human. Here is the same information
+in TAB-delimited format:</p></div>
+<div class="literalblock">
+<div class="content">
+<pre><code>Dive site       Dive date       Time    Dive_duration   Dive_depth      Dive buddy
+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 the limits of the parser
+used. When encountering problems with <em>CSV</em> imports, first try with a
+smaller file to make sure everything works.</td>
+</tr></table>
+</div>
+</div>
+</div>
+</div>
+<div class="sect2">
+<h3 id="S_Companion">5.4. Importing GPS coordinates with the <em>Subsurface Companion App</em> for mobile phones</h3>
+<div class="paragraph"><p>Using the <strong>Subsurface Companion App</strong> on an <em>Android device</em>   or
+<a href="#S_iphone"><em>iPhone</em></a> with GPS, the coordinates
+for the diving
+location can be automatically passed to the <em>Subsurface</em>
+dive log. The Companion App stores the dive locations on
+a dedicated Internet file server. <em>Subsurface</em>, in turn, can collect
+the localities from the file server.</p></div>
+<div class="paragraph"><p>To do this:</p></div>
+<div class="sect3">
+<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.
+</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>.
+</p>
+</li>
+</ul></div>
+</div>
+<div class="sect3">
+<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.
+</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.
+</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).
+</p>
+</li>
+</ul></div>
+<div class="admonitionblock">
+<table><tr>
+<td class="icon">
+<img src="images/icons/important.png" alt="Important" />
+</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 in <em>Subsurface</em> itself.  This facilitates
+synchronisation between <em>Subsurface</em> and the Companion App.</td>
+</tr></table>
+</div>
+<div class="sect4">
+<h5 id="_creating_new_dive_locations">Creating new dive locations</h5>
+<div class="paragraph"><p>Now one is ready to get a dive position and send it to the server. The
+Android display will look like the left hand image (<strong>A</strong>) below, but without
+any dives.</p></div>
+<div class="paragraph"><p>Touch the "+" icon on the top right to add a new dive site, a menu will be
+showed with 3 options:</p></div>
+<div class="ulist"><ul>
+<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.
+</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.
+</p>
+</li>
+</ul></div>
+<div class="imageblock" style="text-align:center;">
+<div class="content">
+<img src="images/Companion_5.jpg" alt="FIGURE: Companion App, add location using map" />
+</div>
+</div>
+<div class="ulist"><ul>
+<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.
+</p>
+</li>
+</ul></div>
+</div>
+<div class="sect4">
+<h5 id="_dive_lists_of_dive_locations">Dive lists of dive locations</h5>
+<div class="paragraph"><p>The main screen shows a list of dive locations, each with a name, date and
+time (see <strong>A</strong> below). Some locations may have an arrow-up icon over the
+selection box to the left indicating that they require upload to the
+server. One can select individual dive locations from the list. A selected
+location has a check mark in the selection box on the left. Group operations
+(such as <em>Delete</em> or <em>Send</em>)  are performed on several locations that are
+selected.</p></div>
+<div class="paragraph"><p>Dive locations in this list can be viewed in two ways: a list of locations
+or a map indicating the dive locations. The display mode (List or Map) is
+changed by selecting <em>Dives</em> at the top left of the screen (see <strong>A</strong> below)
+and then selecting the display mode. The display mode can be changed either
+from the list of locations or from the map (see <strong>B</strong> below). If one selects a
+location (on the list or on the map), an editing panel opens (see <strong>C</strong> below)
+where the dive description or other details may be changed.</p></div>
+<div class="imageblock" style="text-align:center;">
+<div class="content">
+<img src="images/Companion_4.jpg" alt="FIGURE: Companion App, add location using map" />
+</div>
+</div>
+<div class="paragraph"><p>When one selects a dive (<strong>not</strong> selecting the check box), the name given to
+it, date/time and GPS coordinates will be shown, with two options at the top
+of the screen:</p></div>
+<div class="ulist"><ul>
+<li>
+<p>
+Edit (pencil): Change the text name or other characteristics of the dive
+  location.
+</p>
+</li>
+<li>
+<p>
+Maps: Display a map showing the dive location.
+</p>
+</li>
+</ul></div>
+<div class="paragraph"><p>After editing and saving a dive location (see <strong>C</strong> above), one needs to
+upload it to the web service, as explained below.</p></div>
+</div>
+<div class="sect4">
+<h5 id="_uploading_dive_locations">Uploading dive locations</h5>
+<div class="paragraph"><p>There are several ways to send locations to the server.  The easiest is by
+simply selecting the locations (See <strong>A</strong> below) and then touching the right
+arrow at the top right of the screen.</p></div>
+<div class="admonitionblock">
+<table><tr>
+<td class="icon">
+<img src="images/icons/important.png" alt="Important" />
+</td>
+<td class="content">Users must be careful, as the trash icon on the right means exactly what it
+should; it deletes the selected dive location(s).</td>
+</tr></table>
+</div>
+<div class="imageblock" style="text-align:center;">
+<div class="content">
+<img src="images/Companion_1.jpg" alt="FIGURE: Screen shots (A-B) of companion app" />
+</div>
+</div>
+<div class="paragraph"><p>After a dive trip using the Companion App, all dive locations are ready to
+be downloaded to a <em>Subsurface</em> dive log (see below).</p></div>
+</div>
+<div class="sect4">
+<h5 id="_settings_on_the_companion_app">Settings on the Companion App</h5>
+<div class="paragraph"><p>Selecting the <em>Settings</em> menu option results in the right hand image above
+(<strong>B</strong>).</p></div>
+</div>
+<div class="sect4">
+<h5 id="_server_and_account">Server and account</h5>
+<div class="ulist"><ul>
+<li>
+<p>
+<em>Web-service URL.</em> This is predefined (<a href="http://api.hohndel.org/">http://api.hohndel.org/</a>)
+</p>
+</li>
+<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.
+</p>
+</li>
+</ul></div>
+</div>
+<div class="sect4">
+<h5 id="_synchronisation">Synchronisation</h5>
+<div class="ulist"><ul>
+<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.
+</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.
+</p>
+</li>
+</ul></div>
+</div>
+<div class="sect4">
+<h5 id="_background_service">Background service</h5>
+<div class="paragraph"><p>Instead of entering a unique dive location, users can leave the service
+running in the background of their Android device, allowing the continuous
+collection of GPS locations.</p></div>
+<div class="paragraph"><p>The settings below define the behaviour of the service:</p></div>
+<div class="ulist"><ul>
+<li>
+<p>
+<em>Min duration.</em> In minutes. The app will try to get a location every X
+  minutes until stopped by the user.
+</p>
+</li>
+<li>
+<p>
+<em>Min distance.</em> In meters. Minimum distance between two locations.
+</p>
+</li>
+<li>
+<p>
+<em>Name template.</em> The name the app will use when saving the locations.
+</p>
+</li>
+</ul></div>
+<div class="admonitionblock">
+<table><tr>
+<td class="icon">
+<img src="images/icons/info.jpg" alt="Tip" />
+</td>
+<td class="content"><em>How does the background service work?</em> Assuming the user sets 5 minutes and
+50 meters in the settings above, the app will start by recording a location
+at the current location, followed by another one at every 5 minutes <strong>or</strong>
+every time one moves 50 m from previous location.  If subsequent locations
+are within a radius of 50 meters from the previous one, a new location is
+not saved. If the user is not moving, only one location is saved, but if the
+user is moving, a trace of the route is obtained by saving a location every
+50 meters.</td>
+</tr></table>
+</div>
+</div>
+<div class="sect4">
+<h5 id="_other">Other</h5>
+<div class="paragraph"><p><em>Mailing List.</em> The mail box for <em>Subsurface</em>. Users can send an email to
+the Subsurface mailing list.</p></div>
+<div class="ulist"><ul>
+<li>
+<p>
+<em>Subsurface website.</em> A link to the URL of Subsurface web
+</p>
+</li>
+<li>
+<p>
+<em>Version.</em> Displays the current version of the Companion App.
+</p>
+</li>
+</ul></div>
+</div>
+<div class="sect4">
+<h5 id="_search">Search</h5>
+<div class="paragraph"><p>Search the saved dive locations by name or by date and time.</p></div>
+</div>
+<div class="sect4">
+<h5 id="_start_service">Start service</h5>
+<div class="paragraph"><p>Initiates the <em>background service</em> following the previously defined
+settings.</p></div>
+</div>
+<div class="sect4">
+<h5 id="_disconnect">Disconnect</h5>
+<div class="paragraph"><p>This is a badly named option that disconnects the app from the server by
+resetting the user ID in the app, showing the first screen where an account
+can be created, retrieve the ID for an existing account or use the users own
+ID. The disconnect option is useful if a user&#8217;s Android device was used to
+download the dive locations of another registered diver.</p></div>
+</div>
+<div class="sect4">
+<h5 id="_send_all_locations">Send all locations</h5>
+<div class="paragraph"><p>This option sends all locations stored in the Android device to the server.</p></div>
+</div>
+</div>
+<div class="sect3">
+<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 &#8594; Import GPS data from Subsurface Service</em>, resulting in the
+image on the left (<strong>A</strong>), below. On first use the DIVERID text box is
+blank. Provide a DIVERID, then select the <em>Download</em> button to initiate the
+download process, after which the screen on the right (<strong>B</strong>) below appears:</p></div>
+<div class="imageblock" style="text-align:center;">
+<div class="content">
+<img src="images/DownloadGPS.jpg" alt="FIGURE: Downloading Companion app GPS data" />
+</div>
+</div>
+<div class="paragraph"><p>Note that the <em>Apply</em> button is now active. By clicking on it, users can
+update the locations of the newly entered or uploaded dives in <em>Subsurface</em>
+which applies the coordinates and names entered on the app for all the new
+dives that match the date-times of the uploaded GPS localities. If one has
+entered the name of the dive location in <em>Subsurface</em> before downloading the
+GPS coordinates, this name will take precedence over downloaded one.</p></div>
+<div class="paragraph"><p>Since <em>Subsurface</em> matches GPS locations from the Android device and dive
+information from the dive computer based on date-time data, automatic
+assignment of GPS data to dives is dependent on agreement of the date-time
+information between these two devices. Although <em>Subsurface</em> has a wide
+range tolerance, it may be unable to identify the appropriate dive if there
+is a large difference between the time in the dive computer and that of the
+Android device, resulting in no updates.</p></div>
+<div class="paragraph"><p>Similar date-times may not always be possible and there may be many reasons
+for this (e.g. time zones), or <em>Subsurface</em> may be unable to decide which is
+the correct position for a dive (e.g. on repetitive dives while running
+<em>background service</em> there may be several locations that would be included
+in the time range that fit not only the first dive, but one or more
+subsequent dives as well).  A workaround for this situation to manually edit
+the date-time of a dive in the <em>Subsurface</em> Dive List <strong>before</strong> downloading
+the GPS data and then to change the date-time back again <strong>after</strong> downloading
+GPS data.</p></div>
+<div class="admonitionblock">
+<table><tr>
+<td class="icon">
+<img src="images/icons/info.jpg" alt="Note" />
+</td>
+<td class="content">TIPS:</td>
+</tr></table>
+</div>
+<div class="ulist"><ul>
+<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).
+</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.
+</p>
+</li>
+</ul></div>
+</div>
+</div>
+<div class="sect2">
+<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">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_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_f20.jpg" alt="FIGURE: Load images option" />
+</div>
+</div>
+<div class="paragraph"><p>This brings up the time synchronisation dialog, shown below. The critical
+problem is that the time synchronisation is not perfect between the dive
+computer used during a dive, and the camera used during that same
+dive. These two devices often differ by several minutes. If <em>Subsurface</em> can
+achieve synchronisation, then the exact times of photographs can be used to
+position photographs on the dive profile.</p></div>
+<div class="paragraph"><p><em>Subsurface</em> achieves this synchronisation in three ways:</p></div>
+<div class="ulist"><ul>
+<li>
+<p>
+<strong>Pro-actively</strong>: Before the dive, ensure synchronisation of the dive computer time settings with
+  the time settings of the camera by changing the date-time settings on one or both of these devices.
+</p>
+</li>
+<li>
+<p>
+<strong>Manually</strong>: If the user wrote down the exact camera time at the start of a dive, the
+  difference in time between the two devices can be determined. Actually, as long as the device
+  settings for time has not been changed in either device, one could write down the times of
+  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_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 <em>Time shift</em> dialog. If one uses
+  the bottom part, the top part of the dialog is ignored. Click on
+  the horizontal bar entitled "<em>Select image of dive computer showing time</em>. This brings up
+  a file browser with which one can select the photograph of the dive computer time. Select the
+  photograph using the file browser and click on <em>OK</em>. This photograph of the dive computer
+  appears in the bottom panel of the <em>Shift times</em> dialog. Now <em>Subsurface</em> knows exactly
+  when the photograph has been taken. Now set the date-time dialog to the left of the photo
+  so that this tool reflects the date and time of the dive computer in the photo. When the
+  date-time tool has been set, <em>Subsurface</em> knows exactly what the time difference between
+  camera and dive computer is, and synchronisation is achieved.
+  Image <strong>B</strong> above shows a photograph of the face of the dive computer and with the date-time tool set to the
+  date-time.
+</p>
+</li>
+</ul></div>
+<div class="paragraph"><p>If the timestamp of a photograph is more than 30 minutes before or after the
+dive, it is not placed on the dive profile.</p></div>
+</div>
+<div class="sect3">
+<h4 id="_viewing_the_photos">5.5.2. Viewing the photos</h4>
+<div class="paragraph"><p>After the images have been loaded, they appear in two places:</p></div>
+<div class="ulist"><ul>
+<li>
+<p>
+the <em>Photos</em> tab of the <strong>Notes</strong> panel.
+</p>
+</li>
+<li>
+<p>
+as tiny icons (stubs) on the dive profile at the appropriate positions
+   reflecting the time each photograph was taken.  In order to view the photos
+   on the dive profile, activate the <em>show-photos</em> button in the tool bar to
+   the left of the dive profile:
+</p>
+</li>
+</ul></div>
+<div class="imageblock" style="text-align:left;">
+<div class="content">
+<img src="images/icons/ShowPhotos_f20.png" alt="FIGURE:Show photos toolbar button" />
+</div>
+</div>
+<div class="paragraph"><p>This results in a profile display as in the image below:</p></div>
+<div class="imageblock" style="text-align:center;">
+<div class="content">
+<img src="images/LoadImage4_f20.jpg" alt="FIGURE: Photos on dive profile" />
+</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_f20.jpg" alt="FIGURE:Thumbnail photo on dive profile" />
+</div>
+</div>
+<div class="paragraph"><p>Clicking on the thumbnail brings up a full size photo overlaid on the
+<em>Subsurface</em> window. This allows good viewing of the photographs that have
+been added (see the image below). Note that the thumbnail has a small
+dustbin icon in the bottom right hand corner (see image above). If one
+selects the dustbin, the image is removed from the dive. Therefore some care
+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_f20.jpg" alt="FIGURE: Full-screen photo on dive profile" />
+</div>
+</div>
+</div>
+<div class="sect3">
+<h4 id="_the_em_photos_em_tab">5.5.3. The <em>Photos</em> tab</h4>
+<div class="paragraph"><p>Photographs associated with a dive are shown as thumbnails in the <em>Photos</em>
+tab of the <em>Notes</em> panel. Photos taken in rapid succession during a dive
+(therefore sometimes with large overlap on the dive profile) can easily be
+accessed in the <em>Photos</em> tab. This tab serves as a tool for individually
+accessing the photos of a dive, while the stubs on the dive profile give an
+indication of when during a dive a photo was taken. By single-clicking on a
+thumbnail in the <em>Photos</em> panel, a photo is selected. By double-clicking a
+thumbnail, the full-sized image is shown, overlaying the <em>Subsurface</em>
+window. A photo can be deleted from the <em>Photos</em> panel by selecting it
+(single-click) and then by pressing the <em>Del</em> key on the keyboard. This
+removes the photo both from the <em>Photos</em> tab as well as the dive profile.</p></div>
+</div>
+<div class="sect3">
+<h4 id="_photos_on_an_external_hard_disk">5.5.4. Photos on an external hard disk</h4>
+<div class="paragraph"><p>Most underwater photographers store their photos on an external drive. If
+such a drive can be mapped by the operating system (almost always the case)
+the photos can be directly accessed by <em>Subsurface</em>. This facilitates the
+interaction between <em>Subsurface</em> and an external repository of photos. When
+associating a dive profile with photos from an external drive, the normal
+procedure of selection and synchronisation (see text above) is used.
+However, after the external drive has been disconnected, <em>Subsurface</em> cannot
+access these photos any more.  If the display of photos is activated (using
+the toolbox to the left of the <em>Dive Profile</em>), the program only shows a
+small white dot where each photo should be on the dive profile.  In addition
+the <em>Photos</em> tab only shows the file names of the photos. This is normal
+behaviour.  If, later, the external drive with the photos is connected
+again, the photos can be seen in the normal way.</p></div>
+</div>
+<div class="sect3">
+<h4 id="S_FindMovedImages">5.5.5. Moving photographs among directories, hard disks or computers</h4>
+<div class="paragraph"><p>After a photograph has been loaded into <em>Subsurface</em> and associated with a specific dive, the directory
+ where the photo lies is stored, allowing <em>Subsurface</em> to find the photograph when the dive is
+ opened again. If the photo or the whole photo collection is moved to another drive or to a different
+ machine, it is unlikely that the directory structure will remain identical to that of the original uploaded
+ photo. When this happens, <em>Subsurface</em> looks for the photos at their original location before they were moved,
+ cannot find them and therefore cannot display them. Because, after moving photos, large numbers of photos
+ may need to be deleted and re-imported from the new location, <em>Subsurface</em> has a mechanism that eases the
+ process of updating the directory information for each photo: automatic updates using fingerprints.</p></div>
+<div class="paragraph"><p>When a photo is loaded into <em>Subsurface</em>, a fingerprint for the image is calculated and stored with the
+ other reference information for that photo. After moving a photo collection (that has already been loaded
+ into <em>Subsurface</em>) to a different directory, disk or computer, <em>Subsurface</em> can  perform the
+ following steps:</p></div>
+<div class="ulist"><ul>
+<li>
+<p>
+look through a particular directory (and all its subdirectories recursively)
+  where photos have been moved
+ to,
+</p>
+</li>
+<li>
+<p>
+calculate fingerprints for all photos in this directory, and
+</p>
+</li>
+<li>
+<p>
+if there is a match between a calculated fingerprint and the one originally
+  calculated when a photo was
+ loaded into <em>Subsurface</em> (even if the original file name has changed), to
+ automatically update the directory information so that <em>Subsurface</em> can find
+ the photo in the new moved directory.
+</p>
+</li>
+</ul></div>
+<div class="paragraph"><p>This is achieved by selecting from the Main Menu: <em>File &#8594;      Find moved images</em>. This brings up a window within
+ which the NEW directory of the photos needs to be specified. Select the appropriate directory and click
+ the <em>Scan</em> button towards the bottom right of the panel. The process may require several minutes to
+ complete, after which <em>Subsurface</em> will show the appropriate photographs when a particular dive is opened.</p></div>
+<div class="sidebarblock" id="Image_fingerprint_upgrade">
+<div class="content">
+<div class="paragraph"><p><strong>Upgrading existing photo collections without fingerprints</strong></p></div>
+<div class="admonitionblock">
+<table><tr>
+<td class="icon">
+<img src="images/icons/important.png" alt="Important" />
+</td>
+<td class="content"><em>Subsurface</em> automatically calculates fingerprints for all images that can
+be accessed by <em>Subsurface</em>.  When manipulating images, ensure that all the
+images associated with the dive log can be accessed by <em>Subsurface</em>.</td>
+</tr></table>
+</div>
+<div class="paragraph"><p><em>Subsurface</em> automatically checks and, if necessary, updates the
+fingerprints associated with a single dive if:
+- The images associated with that dive are visible as thumbnails on the <strong>Dive
+  Profile</strong>.
+- One edits anything in the <strong>Notes tab</strong> panel and save the edits by selecting
+  <em>Apply changes</em>.</p></div>
+</div></div>
+</div>
+</div>
+<div class="sect2">
+<h3 id="_logging_special_types_of_dives">5.6. Logging special types of dives</h3>
+<div class="sect3">
+<h4 id="S_MulticylinderDives">5.6.1. Multicylinder dives</h4>
+<div class="paragraph"><p><em>Subsurface</em> easily handles dives involving more than one
+cylinder. Multi-cylinder diving usually happens (a) if a diver does not have
+enough gas for the complete dive in a single cylinder; (b) if the diver
+needs more than one gas mixture because of the depth or the decompression
+needs of the dive. For this reason multi-cylinder dives are often used by
+technical divers who dive deep or long. As far as <em>Subsurface</em> is concerned,
+there are only two types of information that need to be provided:</p></div>
+<div class="ulist"><ul>
+<li>
+<p>
+<strong>Describe the cylinders used during the dive</strong> This is performed in the <strong>Equipment tab</strong> of
+  the <strong>Info</strong> panel, as <a href="#cylinder_definitions">described above</a>. Enter the cylinders one by one,
+  specifying the characteristics of the cylinder and the gas composition within each cylinder.
+</p>
+</li>
+<li>
+<p>
+<strong>Record the times at which switches from one cylinder to another was done:</strong> This is information
+  provided by some dive computers (provided the diver indicated these changes to the dive computer
+  by pressing specific buttons). If the dive computer does not provide the information, the diver has to
+  record these changes using a different method, e.g. writing it on a slate.
+</p>
+</li>
+<li>
+<p>
+<strong>Record the cylinder changes on the dive profile</strong>: If the latter option
+  was followed, the diver needs to indicate the gas change event by right-clicking at the appropriate point
+  in time on the <strong>Dive Profile</strong> panel and indicating the cylinder to which the change was made. After
+  right-clicking, follow the context menu to "Add gas change" and select the appropriate cylinder from
+  those defined during the first step, above (see image below). If the
+  <strong>tank bar</strong> button in the toolbar has been activated, the cylinder switches are also indicated in the
+  tank bar.
+</p>
+</li>
+</ul></div>
+<div class="paragraph"><p>Having performed these tasks, <em>Subsurface</em> indicates the appropriate use of
+cylinders in the dive profile.  Below is a multi-cylinder dive, starting off
+with EAN28, then changing cylinders to EAN50 after 26 minutes to perform
+decompression.</p></div>
+<div class="imageblock" style="text-align:center;">
+<div class="content">
+<img src="images/multicylinder_dive.jpg" alt="FIGURE: Multicylinder profile" />
+</div>
+</div>
+</div>
+<div class="sect3">
+<h4 id="_sidemount_dives">5.6.2. Sidemount dives</h4>
+<div class="paragraph"><p>Sidemount diving is just another form of multi-cylinder diving, often with
+both or all cylinders having the same gas mixture. Although it is a popular
+configuration for cave divers, sidemount diving can be performed by
+recreational divers who have completed the appropriate training. Sidemount
+dive logging involves, exactly as with multi-cylinder dives, above, three
+steps:</p></div>
+<div class="ulist"><ul>
+<li>
+<p>
+<strong>During the dive, record cylinder switch events</strong>. Since sidemount diving normally involves two
+  cylinders with air or with the same gas mixture, <em>Subsurface</em> distinguishes among these different
+  cylinders. In contrast, many dive computers that allow gas switching only distinguish among different
+  <em>gases</em> used, not among different <em>cylinders</em> used. This means that when sidemount dives are downloaded
+  from these dive computers, the events of switching between cylinders with the same gas are not downloaded. This may mean
+  that one may have to keep a written log of cylinder switch times using a slate, or (if the dive computer
+  has this facility) marking each cylinder switch with a bookmark that can be retrieved later. Returning
+  from a dive with the times of cylinder changes is the only tricky part of logging sidemount dives.
+</p>
+</li>
+<li>
+<p>
+<strong>Within <em>Subsurface</em> describe the cylinders used during the dive</strong>. The diver needs to provide the
+  specifications of the different cylinders, using the <strong>Equipment</strong> tab of the <strong>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 in the 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 dive
+logging tool.</p></div>
+</div>
+<div class="sect3">
+<h4 id="S_sSCR_dives">5.6.3. Semi-closed circuit rebreather (SCR) dives</h4>
+<div class="admonitionblock">
+<table><tr>
+<td class="icon">
+<img src="images/halcyon_RB80.jpg" alt="Note" />
+</td>
+<td class="content">Passive semi-closed rebreathers (pSCR) comprise a technical advance in
+diving equipment that recirculates the breathing gas that a diver breathes,
+while removing carbon dioxide from the exhaled gas. While a small amount
+(typically a tenth) of the exhaled breathing gas is released into the water,
+a small amount of fresh gas is released from the back gas cylinder
+(typically containing nitrox).  A diver, using a single cylinder of
+breathing gas can therefore dive for much longer periods than using a
+recreational open-circuit configuration. With pSCR equipment, a very small
+amount of breathing gas is released every time the breather inhales. With
+active SCR (aSCR) equipment, in contrast, a small amount of breathing gas is
+released continuously from the back cylinder.</td>
+</tr></table>
+</div>
+<div class="paragraph"><p>To log pSCR dives, no special procedures are required, just the normal steps
+outlined above:</p></div>
+<div class="ulist"><ul>
+<li>
+<p>
+Select pSCR in the <em>Dive Mode</em> dropdown list on the <strong>Info</strong> panel.
+</p>
+</li>
+<li>
+<p>
+pSCR diving often involves gas changes, requiring an additional cylinder.
+  Define all the appropriate cylinders as described above and indicate the
+  cylinder/gas changes as described above in the section on
+  <a href="#S_MulticylinderDives">multicylinder dives</a>.
+</p>
+</li>
+</ul></div>
+<div class="paragraph"><p>If a pSCR <em>Dive Mode</em> has been selected, the dive ceiling for pSCR dives is
+adjusted for the oxygen drop across the mouthpiece which often requires
+longer decompression periods. Below is a dive profile of a pSCR dive using
+EAN36 on the back cylinder and oxygen for decompression. Note that this dive
+lasted over two hours.</p></div>
+<div class="imageblock" style="text-align:center;">
+<div class="content">
+<img src="images/pSCR_profile.jpg" alt="FIGURE: pSCR profile" />
+</div>
+</div>
+</div>
+<div class="sect3">
+<h4 id="S_CCR_dives">5.6.4. 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
+regulate the oxygen concentration to remain within safe diving limits.  The
+CCR interface of <em>Subsurface</em> is currently experimental and under active
+development. Subsurface currently supports Poseidon MkVI and APD
+Discovery/Evolution dive computers. In contrast to a conventional
+recreational dive computer, a CCR system computer does not allow the
+download of a log containing multiple dives. Rather, each dive is stored
+independently. This means that <em>Subsurface</em> cannot download a dive log
+directly from a CCR dive computer, but that it imports CCR dive logs in the
+same way that it imports dive log data from other digital databases: one
+dive at a time.</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 (labled <em>Filter:</em>) of appropriate devices that currently
+includes(Poseidon) MkVI or APD log viewer files (import for other CCR
+equipment is under active development). Having selected the appropriate CCR
+format and the directory where the original dive logs have been stored from
+the CCR dive computer, one can select a particular dive log file (in the
+case of the MkVI it is a file with a .txt extension). After selecting the
+appropriate dive log, activate the <em>Open</em> button at the bottom right hand of
+the universal import dialogue.  The selected dive is imported to the
+<em>Subsurface</em> dive list.</p></div>
+</div>
+<div class="sect4">
+<h5 id="_displayed_information_for_a_ccr_dive">Displayed information for a CCR dive</h5>
+<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 are 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 is shown in the image below,
+representing two checkboxes that modify the display of pO<sub>2</sub> when the
+appropriate toolbar button on the Dive Profile has been activated.</p></div>
+<div class="imageblock" style="text-align:center;">
+<div class="content">
+<img src="images/CCR_preferences_f20.jpg" alt="FIGURE: CCR preferences panel" />
+</div>
+</div>
+<div class="paragraph"><p>Checking any of these check boxes allows the display of additional
+oxygen-related information whenever the pO<sub>2</sub> toolbar button on the
+<em>Profile</em> panel is activated.  The first checkbox allows the display of
+setpoint information. This is a red line superimposed on the green oxygen
+partial pressure graph and allows a comparison of the mean measured oxygen
+partial pressure and the setpoint values, as shown below.</p></div>
+<div class="imageblock" style="text-align:center;">
+<div class="content">
+<img src="images/CCR_setpoint_f20.jpg" alt="FIGURE: CCR setpoint and po2 graph" />
+</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 overlay 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_f22.jpg" alt="FIGURE: CCR dive profile" />
+</div>
+</div>
+<div class="paragraph"><p><em>Equipment-specific information</em>: Equipment-specific information gathered by
+<em>Subsurface</em> is shown in the <a href="#S_ExtraDataTab">Extra data tab</a>. This may
+include setup information or metadata about the dive.</p></div>
+<div class="paragraph"><p>The deco ceiling calculated by Subsurface is not very accurate because the
+precise pressure of nitrogen in the loop can usually not be determined from
+the dive log imported from the CCR equipment. Many CCR dive computers,
+however, report an internally-calculated deco ceiling that is reported in
+the dive log, reflecting a more accurate assessment. The display of this
+ceiling is activated by clicking the appropriate button to the left of the
+dive profile:</p></div>
+<div class="imageblock">
+<div class="content">
+<img src="images/icons/cceiling.jpg" alt="DC ceiling icon" />
+</div>
+</div>
+<div class="paragraph"><p>The default colour of the computer-generated deco ceiling is white. However,
+this can be set to red by checking the appropriate check box after selecting
+<em>File &#8594; Preferences &#8594; Graph</em>.  Below is a dive profile indicating the dive
+computer-generated deco ceiling:</p></div>
+<div class="imageblock" style="text-align:center;">
+<div class="content">
+<img src="images/CCR_dive_ceilingF22.jpg" alt="FIGURE: CCR computer-generated deco ceiling" />
+</div>
+</div>
+<div class="paragraph"><p>More equipment-specific information for downloading CCR dive logs for
+Poseidon MkVI and APD equipment can be found in
+<a href="#_appendix_b_dive_computer_specific_information_for_importing_dive_information">Appendix
+B</a>.</p></div>
+</div>
+</div>
+</div>
+</div>
+</div>
+<div class="sect1">
+<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_info_strong_tab_for_individual_dives">6.1. The <strong>Info</strong> tab (for individual dives)</h3>
+<div class="paragraph"><p>The Info tab gives some summary information about a particular dive that has
+been selected in the <strong>Dive List</strong>. Useful information here includes the
+surface interval before the dive, the maximum and mean depths of the dive,
+the gas volume consumed, the surface air consumption (SAC) and the number of
+oxygen toxicity units (OTU) incurred.</p></div>
+<div class="admonitionblock">
+<table><tr>
+<td class="icon">
+<img src="images/icons/info.jpg" alt="Note" />
+</td>
+<td class="content">Gas consumption and SAC calculations: <em>Subsurface</em> calculates SAC and Gas
+consumption taking in account gas incompressibility, particularly at tank
+pressures above 200 bar, making them more accurate.  Users should refer to
+<a href="#SAC_CALCULATION">Appendix D</a> for more information.</td>
+</tr></table>
+</div>
+</div>
+<div class="sect2">
+<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 dive has been selected,
+figures pertaining to only that dive are given. This tab shows the number of
+dives selected, the total amount of dive time in these dives, as well as the
+minimum, maximum and mean for the dive duration, water temperature and
+surface air consumption (SAC). It also shows the depth of the shallowest and
+deepest dives of those selected.</p></div>
+</div>
+<div class="sect2">
+<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" />
+</div>
+</div>
+<div class="paragraph"><p>Of all the panels in <em>Subsurface</em>, the Dive Profile contains the most
+detailed information about each dive. The Dive Profile has a <strong>button bar</strong> on
+the left hand side that allows control over several display options. The
+functions of these buttons are described below. The main item in the Dive
+Profile is the graph of dive depth as a function of time. In addition to the
+obvious information of the depth it also shows the ascent and descent rates
+compared to the recommended speed of going up or down in the water
+column. This information is given using different colours:</p></div>
+<div class="tableblock">
+<table rules="all"
+width="100%"
+frame="border"
+cellspacing="0" cellpadding="4">
+<col width="33%" />
+<col width="33%" />
+<col width="33%" />
+<tbody>
+<tr>
+<td align="left" valign="top"><p class="table"><strong>Couleur</strong></p></td>
+<td align="left" valign="top"><p class="table"><strong>Vitesse de descente (m/min)</strong></p></td>
+<td align="left" valign="top"><p class="table"><strong>Vitesse de remontée (m/min)</strong></p></td>
+</tr>
+<tr>
+<td align="left" valign="top"><p class="table">Rouge</p></td>
+<td align="left" valign="top"><p class="table">&gt; 30</p></td>
+<td align="left" valign="top"><p class="table">&gt; 18</p></td>
+</tr>
+<tr>
+<td align="left" valign="top"><p class="table">Orange</p></td>
+<td align="left" valign="top"><p class="table">18 - 30</p></td>
+<td align="left" valign="top"><p class="table">9 - 18</p></td>
+</tr>
+<tr>
+<td align="left" valign="top"><p class="table">Jaune</p></td>
+<td align="left" valign="top"><p class="table">9 - 18</p></td>
+<td align="left" valign="top"><p class="table">4 - 9</p></td>
+</tr>
+<tr>
+<td align="left" valign="top"><p class="table">Vert clair</p></td>
+<td align="left" valign="top"><p class="table">1.5 - 9</p></td>
+<td align="left" valign="top"><p class="table">1.5 - 4</p></td>
+</tr>
+<tr>
+<td align="left" valign="top"><p class="table">Vert foncé</p></td>
+<td align="left" valign="top"><p class="table">&lt; 1.5</p></td>
+<td align="left" valign="top"><p class="table">&lt; 1.5</p></td>
+</tr>
+</tbody>
+</table>
+</div>
+<div class="paragraph"><p>The profile also includes depth readings for the peaks and troughs in the
+graph.  Thus, users should see the depth of the deepest point and other
+peaks. Mean depth is plotted as a grey line, indicating mean dive depth up
+to a particular moment during the dive.</p></div>
+<div class="admonitionblock">
+<table><tr>
+<td class="icon">
+<img src="images/icons/scale.jpg" alt="Note" />
+</td>
+<td class="content">In some cases the dive profile does not fill the whole area of the <strong>Dive
+Profile</strong> panel. Clicking the <strong>Scale</strong> button in the toolbar on the left of
+the dive profile frequently increases the size of the dive profile to fill
+the area of the panel efficiently.</td>
+</tr></table>
+</div>
+<div class="paragraph"><p><strong>Water temperature</strong> is displayed with its own blue line with temperature values
+placed adjacent to significant changes.</p></div>
+<div class="paragraph"><p>The dive profile can include graphs of the <strong>partial pressures</strong> of O<sub>2</sub>,
+N<sub>2</sub>, and He during the dive (see figure above) as well as a calculated and
+dive computer reported deco ceilings (only visible for deep, long, or
+repetitive dives).  Partial pressures of oxygen are indicated in green,
+those of nitrogen in black, and those of helium in dark red. These partial
+pressure graphs are shown below the profile data.</p></div>
+<div class="admonitionblock">
+<table><tr>
+<td class="icon">
+<img src="images/icons/O2.jpg" alt="Note" />
+</td>
+<td class="content">Clicking this button allows display of the partial pressure of <strong>oxygen</strong>
+during the dive. This is depicted below the dive depth and water temperature
+graphs.</td>
+</tr></table>
+</div>
+<div class="admonitionblock">
+<table><tr>
+<td class="icon">
+<img src="images/icons/N2.jpg" alt="Note" />
+</td>
+<td class="content">Clicking this button allows display of the partial pressure of <strong>nitrogen</strong>
+during the dive.</td>
+</tr></table>
+</div>
+<div class="admonitionblock">
+<table><tr>
+<td class="icon">
+<img src="images/icons/He.jpg" alt="Note" />
+</td>
+<td class="content">Clicking this button allows display of the partial pressure of <strong>helium</strong>
+during the dive.  This is only of importance to divers using Trimix,
+Helitrox or similar breathing gasses.</td>
+</tr></table>
+</div>
+<div class="paragraph"><p>The <strong>air consumption</strong> graph displays the tank pressure and its change during
+the dive. The air consumption takes depth into account so that even when
+manually entering the start and end pressures the graph is not a straight
+line.  Similarly to the depth graph the slope of the tank pressure gives the
+user information about the momentary SAC rate (Surface Air Consumption) when
+using an air integrated dive computer.  Here the colour coding is not
+relative to some absolute values but relative to the average normalised air
+consumption during the dive. So areas that are red or orange indicate times
+of increased normalized air consumption while dark green reflects times when
+the diver was using less gas than average.</p></div>
+<div class="admonitionblock">
+<table><tr>
+<td class="icon">
+<img src="images/icons/Heartbutton.png" alt="Note" />
+</td>
+<td class="content">Clicking on the heart rate button will allow the display of heart rate
+information during the dive if the dive computer was attached to a heart
+rate sensor.</td>
+</tr></table>
+</div>
+<div class="paragraph"><p>It is possible to <strong>zoom</strong> into the profile graph. This is done either by using
+the scroll wheel / scroll gesture of your mouse or trackpad. By default
+<em>Subsurface</em> always shows a profile area large enough for at least 30 minutes
+and 30m
+ (100ft) – this way short or shallow dives are intuitively recognizable;
+something
+that free divers clearly won’t care about.</p></div>
+<div class="imageblock" style="text-align:center;">
+<div class="content">
+<img src="images/MeasuringBar.png" alt="FIGURE: Measuring Bar" />
+</div>
+</div>
+<div class="admonitionblock">
+<table><tr>
+<td class="icon">
+<img src="images/icons/ruler.jpg" alt="Note" />
+</td>
+<td class="content">Measurements of <strong>depth or time differences</strong> can be achieved by using the
+<strong>ruler button</strong> on the left of the dive profile panel.  The measurement is
+done by dragging the red dots to the two points on the dive profile that the
+user wishes to measure. Information is then given in the horizontal white
+area underneath the two red dots.</td>
+</tr></table>
+</div>
+<div class="admonitionblock">
+<table><tr>
+<td class="icon">
+<img src="images/icons/ShowPhotos.png" alt="Note" />
+</td>
+<td class="content">Photographs that have been added to a dive can be shown on the profile by
+selecting the <strong>Show-photo</strong> button. The position of a photo on the profile
+indicates the exact time when this photo was taken. If this button is not
+active, the photos are hidden.</td>
+</tr></table>
+</div>
+<div class="paragraph"><p>The profile can also include the dive computer reported <strong>ceiling</strong> (more
+precisely, the deepest deco stop that the dive computer calculated for each
+particular moment in time) as a red overlay on the dive profile. Ascent
+ceilings arise when a direct ascent to the surface increases the risk of a
+diver suffering from decompression sickness (DCS) and it is necessary to
+either ascend slower or to perform decompression stop(s) before ascending to
+the surface. Not all dive computers record this information and make it
+available for download; for example all of the Suunto dive computers fail to
+make this very useful data available to divelog software. <em>Subsurface</em> also
+calculates ceilings independently, shown as a green overlay on the dive
+profile.  Because of the differences in algorithms used and amount of data
+available (and other factors taken into consideration at the time of the
+calculation) it is unlikely that ceilings from dive computers and from
+<em>Subsurface</em> are the same, even if the same algorithm and <em>gradient factors</em>
+(see below) are used.  It is also quite common that <em>Subsurface</em> calculates
+a ceiling for non-decompression dives when the dive computer stayed in
+non-deco mode during the whole dive (represented by the <span class="green">dark green</span>
+section in the profile at the beginning of this section). This is caused by
+the fact that <em>Subsurface’s</em> calculations describe the deco obligation at
+each moment during a dive, while dive computers usually take the upcoming
+ascent into account. During the ascent some excess nitrogen (and possibly
+helium) are already breathed off so even though the diver technically
+encountered a ceiling at depth, the dive still does not require an explicit
+deco stop. This feature allows dive computers to offer longer non-stop
+bottom times.</p></div>
+<div class="admonitionblock">
+<table><tr>
+<td class="icon">
+<img src="images/icons/cceiling.jpg" alt="Note" />
+</td>
+<td class="content">If the dive computer itself calculates a ceiling and makes it available to
+<em>Subsurface</em> during upload of dives, this can be shown as a red area by
+checking <strong>Dive computer reported ceiling</strong> button on the Profile Panel.</td>
+</tr></table>
+</div>
+<div class="admonitionblock">
+<table><tr>
+<td class="icon">
+<img src="images/icons/ceiling1.jpg" alt="Note" />
+</td>
+<td class="content">If the <strong>Calculated ceiling</strong> button on the Profile Panel is clicked, then a
+ceiling, calculated by <em>Subsurface</em>, is shown in green if it exists for a
+particular dive (<strong>A</strong> in figure below). This setting can be modified in two
+ways:</td>
+</tr></table>
+</div>
+<div class="admonitionblock">
+<table><tr>
+<td class="icon">
+<img src="images/icons/ceiling2.jpg" alt="Note" />
+</td>
+<td class="content">If, in addition, the <strong>show all tissues</strong> button on the Profile Panel is
+clicked, the ceiling is shown for the tissue compartments following the
+Bühlmann model (<strong>B</strong> in figure below).</td>
+</tr></table>
+</div>
+<div class="admonitionblock">
+<table><tr>
+<td class="icon">
+<img src="images/icons/ceiling3.jpg" alt="Note" />
+</td>
+<td class="content">If, in addition, the <strong>3m increments</strong> button on the Profile Panel is clicked,
+then the ceiling is indicated in 3 m increments (<strong>C</strong> in figure below).</td>
+</tr></table>
+</div>
+<div class="imageblock" style="text-align:center;">
+<div class="content">
+<img src="images/Ceilings2.jpg" alt="Figure: Ceiling with 3m resolution" />
+</div>
+</div>
+<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).  Tissue pressures are calculated using the Bühlmann
+ZH-L16 algorithm and are displayed as lines ranging from green (faster
+tissues) to blue (slower tissues).  The black line, graphed above the
+ambient pressure, is the maximum allowable tissue supersaturation (pressure
+limit) derived from the gradient factors specified in the <strong>Preferences</strong>. For
+divers involved in planned decompression diving, efficient rates of
+offgasing are obtained with tissue pressures between the ambient inert gas
+pressure (grey line) and the pressure limit (black line). This display is a
+representation of the tissue pressures during the whole dive. In contrast,
+the <a href="#S_gas_pressure_graph">Gas Pressure Graph</a> in the <strong>Information Box</strong>
+on the <strong>Dive Profile</strong> is an instantaneous reflection of tissue pressures at
+the moment in time reflected by the position of the cursor on the dive
+profile.</td>
+</tr></table>
+</div>
+<div class="imageblock" style="text-align:center;">
+<div class="content">
+<img src="images/tissuesGraph.jpg" alt="Figure: Inert gas tissue pressure graph" />
+</div>
+</div>
+<div class="paragraph"><p>Gradient Factor settings strongly affect the calculated ceilings and their
+depths.  For more information about Gradient factors, see the section on
+<a href="#S_GradientFactors">Gradient Factor Preference settings</a>. The currently
+used gradient factors (e.g. GF 35/75) are shown above the depth profile if
+the appropriate toolbar buttons are activated.  <strong>N.B.:</strong> The indicated
+gradient factors are NOT the gradient factors in use by the dive computer,
+but those used by <em>Subsurface</em> to calculate deco obligations during the
+dive. For more information external to this manual see:</p></div>
+<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>
+</p>
+</li>
+<li>
+<p>
+<a href="http://www.rebreatherworld.com/general-and-new-to-rebreather-articles/5037-gradient-factors-for-dummies.html">Gradient factors for dummies, by Kevin Watts</a>
+</p>
+</li>
+</ul></div>
+</div>
+<div class="sect2">
+<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 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 involve
+a selection of which gas is being switched to, the list of choices being
+based on the available gases defined in the <strong>Equipment</strong> Tab. Set-point
+change events open a dialog allowing to choose the next set-point value. As
+in the planner, a set-point value of zero indicates the diver is breathing
+from an open circuit system while any non-zero value 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="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 only the top line of the Information Box is visible (see
+left-hand part of figure (<strong>A</strong>) below). The Information Box can be moved
+around in the <strong>Dive Profile</strong> panel by click-dragging it with the mouse so
+that it is not obstructing important detail. The position of the Information
+Box is saved and used again during subsequent dive analyses.</p></div>
+<div class="imageblock" style="text-align:center;">
+<div class="content">
+<img src="images/InfoBox2.jpg" alt="Figure: Information Box" />
+</div>
+</div>
+<div class="paragraph"><p>The moment the mouse points inside the <strong>Dive Profile</strong> panel, the information
+box expands and shows many data items. In this situation, the data reflect
+the time point along the dive profile indicated by the mouse cursor (see
+right-hand part of figure (<strong>B</strong>) above where the Information Box reflects the
+situation at the position of the cursor [arrow] in that image). Therefore,
+moving the cursor in the horizontal direction allows the Information Box to
+show information for any point along the dive profile.  In this mode, the
+Information Box gives extensive statistics about depth, gas and ceiling
+characteristics of the particular dive. These include: Time period into the
+dive (indicated by a @), depth, cylinder pressure (P), temperature,
+ascent/descent rate, surface air consumption (SAC), oxygen partial pressure,
+maximum operating depth, equivalent air depth (EAD), equivalent narcotic
+depth (END), equivalent air density depth (EADD), decompression requirements
+at that instant in time (Deco), time to surface (TTS), the calculated
+ceiling, as well as the calculated ceiling for several Bühlmann tissue
+compartments.</p></div>
+<div class="paragraph"><p>The user has control over the display of several statistics, represented as
+four buttons on the left of the profile panel. These are:</p></div>
+<div class="admonitionblock">
+<table><tr>
+<td class="icon">
+<img src="images/icons/MOD.jpg" alt="Note" />
+</td>
+<td class="content">Clicking this button causes the Information Box to display the <strong>Maximum
+Operating Depth (MOD)</strong> of the dive, given the gas mixture used. MOD is
+dependent on the oxygen concentration in the breathing gas.  For air (21%
+oxygen) it is around 57 m if a maximum pO<sub>2</sub> of 1.4 is specified in the
+<strong>Preferences</strong> section (select <em>File</em> &#8594; Preferences &#8594; Graph_ and edit the
+text box <em>Max pO<sub>2</sub> when showing MOD</em>.  Below the MOD there is a markedly
+increased risk of exposure to the dangers associated with oxygen toxicity.</td>
+</tr></table>
+</div>
+<div class="admonitionblock">
+<table><tr>
+<td class="icon">
+<img src="images/icons/NDL.jpg" alt="Note" />
+</td>
+<td class="content">Clicking this button causes the Information Box to display the <strong>No-deco
+Limit (NDL)</strong> or the <strong>Total Time to Surface (TTS)</strong>. NDL is the time duration
+that a diver can continue with a dive, given the present depth, that does
+not require decompression (that is, before an ascent ceiling appears). Once
+one has exceeded the NDL and decompression is required (that is, there is an
+ascent ceiling above the diver, then TTS gives the number of minutes
+required before the diver can surface. TTS includes ascent time as well as
+decompression time.</td>
+</tr></table>
+</div>
+<div class="admonitionblock">
+<table><tr>
+<td class="icon">
+<img src="images/icons/SAC.jpg" alt="Note" />
+</td>
+<td class="content">Clicking this button causes the Information Box to display the <strong>Surface Air
+Consumption (SAC)</strong>.  SAC is an indication of the surface-normalised
+respiration rate of a diver. The value of SAC is less than the real
+respiration rate because a diver at 10m uses breathing gas at a rate roughly
+double that of the equivalent rate at the surface. SAC gives an indication
+of breathing gas consumption rate independent of the depth of the dive so
+that the respiratory rates of different dives can be compared. The units for
+SAC is litres/min or cub ft/min.</td>
+</tr></table>
+</div>
+<div class="admonitionblock">
+<table><tr>
+<td class="icon">
+<img src="images/icons/EAD.jpg" alt="Note" />
+</td>
+<td class="content">Clicking this button displays the <strong>Equivalent Air Depth (EAD)</strong> for nitrox
+dives as well as the <strong>Equivalent Narcotic Depth (END)</strong> for trimix
+dives. These are numbers of importance to divers who use breathing gases
+other than air. Their values are dependent on the composition of the
+breathing gas.  The EAD is the depth of a hypothetical air dive that has the
+same partial pressure of nitrogen as the current depth of the nitrox dive at
+hand. A nitrox dive leads to the same decompression obligation as an air
+dive to the depth equalling the EAD. The END is the depth of a hypothetical
+air dive that has the same sum of partial pressures of the narcotic gases
+nitrogen and oxygen as the current trimix dive. A trimix diver can expect
+the same narcotic effect as a diver breathing air diving at a depth
+equalling the END.</td>
+</tr></table>
+</div>
+<div class="paragraph"><p>Figure (<strong>B</strong>) above shows an information box with a nearly complete set of
+data.</p></div>
+<div class="sect3">
+<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 of the cursor on the <strong>Dive Profile</strong>. The
+drawing on the left below indicates the meaning of the different parts of
+the Gas Pressure Bar Graph.</p></div>
+<div class="imageblock" style="text-align:center;">
+<div class="content">
+<img src="images/GasPressureBarGraph.jpg" alt="FIGURE:Gas Pressure bar Graph" />
+</div>
+</div>
+<div class="ulist"><ul>
+<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.
+</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.
+</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.
+</p>
+</li>
+<li>
+<p>
+The top black horizontal line indicates the gradient factor that applies to
+  the depth of the diver at the particular point on the <strong>Dive Profile</strong>. The
+  gradient factor shown is an interpolation between the GFLow and GFHigh
+  values specified in the Graph tab of the <strong>Preferences Panel</strong> of
+  <strong>Subsurface</strong>.
+</p>
+</li>
+<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.
+</p>
+</li>
+</ul></div>
+<div class="paragraph"><p>These five values are indicated on the left in the graph above. The way the
+Gas Pressure Bar Graph changes during a dive is indicated on the right hand
+side of the above figure for a diver using EAN32.</p></div>
+<div class="ulist"><ul>
+<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
+  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.
+</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.
+</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.
+</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>.
+</p>
+</li>
+</ul></div>
+</div>
+</div>
+</div>
+</div>
+<div class="sect1">
+<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">7.1. The Dive List context menu</h3>
+<div class="paragraph"><p>Several actions on either a single dive or a group of dives can be performed
+using the Dive List Context Menu, found by selecting either a single dive or
+a group of dives and then right-clicking.</p></div>
+<div class="imageblock" style="text-align:center;">
+<div class="content">
+<img src="images/ContextMenu.jpg" alt="Figure: Context Menu" />
+</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_columns_showed_in_the_strong_dive_list_strong_panel">7.1.1. Customising the columns showed in the <strong>Dive List</strong> panel</h4>
+<div class="imageblock" style="text-align:center;">
+<div class="content">
+<img src="images/DiveListOptions.jpg" alt="Example: Dive list info options" />
+</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 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 (reflected by the check symbols) and the list is immediately
+updated. Preferences for information shown in the <strong>Dive List</strong> are saved and
+used when <em>Subsurface</em> is re-opened.</p></div>
+</div>
+</div>
+<div class="sect2">
+<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 given a choice with
+respect to the lowest sequence number to be used.  Completing this operation
+results in new sequence numbers (based on date/time)  for the dives in the
+<strong>Dive List</strong> panel.</p></div>
+<div class="paragraph"><p>One can also renumber a few selected dives in the dive list. Select the
+dives that need renumbering. Right-click on the selected list and use the
+Dive List Context Menu to perform the renumbering. A popup window appears
+requiring the user to specify the starting number for the renumbering
+process.</p></div>
+</div>
+<div class="sect2">
+<h3 id="S_Group">7.3. Grouping dives into trips and manipulating trips</h3>
+<div class="paragraph"><p>For regular divers, the dive list can rapidly become very long. <em>Subsurface</em>
+can group dives into <em>trips</em>. It performs this by grouping dives that have
+date/times not separated in time by more than two days, thus creating a
+single heading for each diving trip represented in the dive log. Below is an
+ungrouped dive list (<strong>A</strong>, on the left) as well as the corresponding grouped
+dive list comprising five dive trips (<strong>B</strong>, on the right):</p></div>
+<div class="imageblock" style="text-align:center;">
+<div class="content">
+<img src="images/Group2.jpg" alt="Figure: Grouping dives" />
+</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) select <em>Log &#8594; Autogroup</em>. The <strong>Dive List</strong> panel
+now shows only the titles for the trips.</p></div>
+<div class="sect3">
+<h4 id="_editing_the_title_and_associated_information_for_a_particular_trip">7.3.1. Editing the title and associated information for a particular trip</h4>
+<div class="paragraph"><p>Normally, in the dive list, minimal information is included in the trip
+title.  More information about a trip can be added by selecting its trip
+title from the <strong>Dive List</strong>. This shows a <strong>Trip Notes</strong> tab in the <strong>Notes</strong>
+panel. Here one can add or edit information about the date/time, the trip
+location and any other general comments about the trip as a whole (e.g. the
+dive company that was dived with, the general weather and surface conditions
+during the trip, etc.).  After entering this information, select <strong>Save</strong> from
+the buttons at the top right of the <strong>Trip Notes</strong> tab. The trip title in the
+<strong>Dive List</strong> panel should now reflect the edited information.</p></div>
+</div>
+<div class="sect3">
+<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">7.3.3. Collapsing or expanding dive information for different trips</h4>
+<div class="paragraph"><p>After selecting a particular trip in the dive list, the context menu allows
+several possibilities to expand or collapse dives within trips. This
+includes expanding all trips and collapsing all trips.</p></div>
+</div>
+<div class="sect3">
+<h4 id="_merging_dives_from_more_than_one_trip_into_a_single_trip">7.3.4. Merging dives from more than one trip into a single trip</h4>
+<div class="paragraph"><p>After selecting a trip title, the context menu allows the merging of trips
+by either merging the selected trip with the trip below or with the trip
+above. (Merge trip with trip below; Merge trip with trip above)</p></div>
+</div>
+<div class="sect3">
+<h4 id="_splitting_a_single_trip_into_more_than_one_trip">7.3.5. Splitting a single trip into more than one trip</h4>
+<div class="paragraph"><p>If a trip includes ten dives, the user can split this trip into two trips
+(trip 1: top 4 dives; trip 2: bottom 6 dives) by selecting and
+right-clicking the top four dives. The resulting context menu allows the
+user to create a new trip by choosing the option <strong>Create new trip
+above</strong>. The top four dives are then grouped into a separate trip. The
+figures below shows the selection and context menu on the left (A) and the
+completed action on the right (B):</p></div>
+<div class="imageblock" style="text-align:center;">
+<div class="content">
+<img src="images/SplitDive3a.jpg" alt="FIGURE: Split a trip into 2 trips" />
+</div>
+</div>
+</div>
+</div>
+<div class="sect2">
+<h3 id="_manipulating_single_dives">7.4. Manipulating single dives</h3>
+<div class="sect3">
+<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
+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">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)  from trip</strong>. The dive(s) now
+appear immediately above or below the trip to which they belonged, depending
+on the date and time of the unlinked dive.</p></div>
+</div>
+<div class="sect3">
+<h4 id="_add_a_dive_to_the_trip_immediately_above">7.4.3. Add a dive to the trip immediately above</h4>
+<div class="paragraph"><p>Selected dives can be moved from the trip to which they belong and placed
+within a separate trip. To do this, select and right-click the dive(s) to
+bring up the context menu, and then select <strong>Create new trip above</strong>.</p></div>
+</div>
+<div class="sect3">
+<h4 id="_shift_the_start_time_of_dive_s">7.4.4. Shift the start time of dive(s)</h4>
+<div class="paragraph"><p>Sometimes it is necessary to adjust the start time of a dive. This may apply
+to situations where dives are performed in different time zones or when the
+dive computer has an erroneous time. In order to do this, select and
+right-click the dive(s) to be adjusted. This action brings up the context
+menu on which the <strong>Shift times</strong> option should be selected. User must then
+specify the time (in hours and minutes) by which the dives should be
+adjusted and click on the option indicating whether the time adjustment
+should be ealier or later.</p></div>
+</div>
+<div class="sect3">
+<h4 id="_merge_dives_into_a_single_dive">7.4.5. Merge dives into a single dive</h4>
+<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 merge these dives onto a single dive by selecting the
+appropriate dives, right-clicking them to bring up the context menu and then
+selecting <strong>Merge selected dives</strong>. It may be necessary to edit the dive
+information in the <strong>Notes</strong> panel to reflect events or conditions that apply
+to the merged dive. The figure below shows the depth profile of two dives
+that were merged:</p></div>
+<div class="imageblock" style="text-align:center;">
+<div class="content">
+<img src="images/MergedDive.png" alt="Example: Merged dive" />
+</div>
+</div>
+</div>
+<div class="sect3">
+<h4 id="_undo_dive_manipulations">7.4.6. Undo dive manipulations</h4>
+<div class="paragraph"><p>Important actions on dives or trips, described above, can be undone or
+redone.  This includes: <em>delete dives</em>, <em>merge dives</em>, <em>renumber dives</em> and
+<em>shift dive times</em>.  To do this after performing any of these actions, from
+the <strong>Main Menu</strong> select <em>Edit</em>. This brings up the possibility to <em>Undo</em> or
+<em>Redo</em> an action.</p></div>
+</div>
+</div>
+<div class="sect2">
+<h3 id="S_Filter">7.5. Filtering the dive list</h3>
+<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 <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 (see image below). The
+<em>Filter Panel</em> can be reset (i.e. all current filters cleared) by selecting
+the <strong>yellow angled arrow</strong>. The <em>Filter Panel</em> may also be minimised by
+selecting the <strong>green up-arrow". When minimised, only these three icons are
+shown.  The panel can be maximised by clicking the icon that minimised the
+panel. The filter may also be reset and closed by selecting the *red button</strong>
+with the white cross.</p></div>
+<div class="imageblock" style="text-align:center;">
+<div class="content">
+<img src="images/Filterpanel.jpg" alt="Figure: Filter panel" />
+</div>
+</div>
+<div class="paragraph"><p>Four filter criteria may be used to filter the dive list: dive tags, person
+(buddy / dive master), dive site and dive suit, each of which is represented
+by a check list with check boxes. Above each check list is a second-level
+filter tool, allowing the listing of only some of the attributes within that
+check list. For instance, typing "<em>ca</em>" in the filter textbox above the tags
+check list results in the tags check list being reduced to "<em>cave</em>" and
+"<em>cavern</em>". Filtering of the check list enables the rapid finding of search
+terms for filtering the dive list.</p></div>
+<div class="paragraph"><p>To activate filtering of the dive list, check at least one check box in one
+of the four check lists. The dive list is then shortened to include only the
+dives that pertain to the criteria specified in the check lists.  The four
+check lists work as a filter with <em>AND</em> operators, Subsurface filters
+therefore for <em>cave</em> as a tag AND <em>Joe Smith</em> as a buddy; but the filters
+within a category are inclusive - filtering for <em>cave</em> and <em>boat</em> shows
+those dives that have either one OR both of these tags.</p></div>
+</div>
+</div>
+</div>
+<div class="sect1">
+<h2 id="S_ExportLog">8. Exporting the dive log or parts of the dive log</h2>
+<div class="sectionbody">
+<div class="paragraph"><p>There are two routes for the export of dive information from Subsurface:</p></div>
+<div class="ulist"><ul>
+<li>
+<p>
+Exporter les informations de plongée vers <em>Facebook</em>
+</p>
+</li>
+<li>
+<p>
+<a href="#S_Export_other">Exporter des informations de plongée vers d&#8217;autres
+  destinations ou formats</a>
+</p>
+</li>
+</ul></div>
+<div class="sect2">
+<h3 id="S_facebook">8.1. Export des informations de plongée vers <em>Facebook</em></h3>
+<div class="paragraph"><p>L&#8217;export des plongées vers <em>Facebook</em> est géré différemment des autres types
+d&#8217;export car une connexion vers <em>Facebook</em> est nécessaire, nécessitant un
+identifiant et un mot de passe. À partir du menu principal, si vous
+sélectionnez <em>Fichier &#8594; Préférences &#8594; Facebook</em>, un écran de connexion est
+présenté (image <strong>A</strong> sur la gauche, ci dessous). Entrez l&#8217;identifiant et le
+mot de passe <em>Facebook</em>. Une fois connecté à <em>Facebook</em>, le panneau de
+l&#8217;image <strong>B</strong> ci dessous est présenté, avec un bouton <em>Déconnecter de
+Facebook</em> pour fermer la connexion <em>Facebook</em>.</p></div>
+<div class="imageblock" style="text-align:center;">
+<div class="content">
+<img src="images/facebook1_f20.jpg" alt="Figure: Facebook login" />
+</div>
+</div>
+<div class="paragraph"><p>From the <em>Subsurface</em> window it is easy to determe whether <em>Subsurface</em> has
+a valid connection to <em>Facebook</em> From the <strong>Main Menu</strong>, select <em>Share on &#8594;
+Facebook</em> (image <strong>A</strong>, below). Normally, the <em>Facebook</em> option is greyed
+out. But if there is a connection to <em>Facebook</em>, this option is active
+(i.e. in black colour and can be selected).</p></div>
+<div class="paragraph"><p>Une fois qu&#8217;une connexion à <em>Facebook</em> est établie, transférer un profil de
+plongée vers <em>Facebook</em> est facile. Assurez-vous que la plongée à transférer
+est affichée dans le panneau <strong>Profil de plongée</strong> de <em>Subsurface</em>. Si, à
+partir du <strong>menu principal</strong>, vous sélectionnez <em>Partager sur &#8594; Facebook</em>,
+une fenêtre s&#8217;affiche, pour déterminer quelles informations seront
+transférées avec le profil de plongée (voir l&#8217;image <strong>B</strong> ci-dessous). Pour
+transférer un profil de plongée vers <em>Facebook</em>, le nom d&#8217;un album
+<em>Facebook</em> doit être fourni. Les cases à cocher sur la partie gauche
+permettent de sélectionner des informations supplémentaires à transférer
+avec le profil de plongée. Ces informations sont affichées dans le champs de
+texte sur la partie droite du panneau. (image <strong>B</strong> ci dessous). Vous pouvez
+facilement modifier le message qui sera envoyé avec le profil de
+plongée. Une fois les informations supplémentaires ajoutées et vérifiées,
+sélectionner le bouton <em>OK</em> qui lance le transfert vers <em>Facebook</em>. Après un
+moment, une fenêtre apparait indiquant le succès du transfert.</p></div>
+<div class="paragraph"><p>À la fois l&#8217;album créé et la publication sur votre ligne temporelle seront
+marquées comme privés. Pour que vos amis puissent voir la publication,
+modifier les permissions à partir d&#8217;une connexion Facebook standard depuis
+un navigateur ou l&#8217;application Facebook. Malgré que cela soit une étape
+supplémentaire, c&#8217;est la meilleure solution pour éviter d&#8217;avoir des
+publications non désirées sur votre ligne temporelle publique.</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>Si besoin, fermer la connexion <em>Facebook</em> en fermant <em>Subsurface</em> ou en
+sélectionnant _Fichier &#8594; Préférences &#8594; Facebook, à partir du menu
+principal et en cliquant sur le bouton approprié dans le panneau des
+préférences Facebook.</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_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>
+<div class="ulist"><ul>
+<li>
+<p>
+<em>Subsurface XML</em> format. This is the native format used by <em>Subsurface</em>.
+</p>
+</li>
+<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.
+</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>.
+</p>
+</li>
+<li>
+<p>
+<em>DiveShare</em> is also a dive log repository 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>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. The HTML export cannot be changed or edited.  It contains
+  most of the information recorded in the dive log. However, it does not show
+  the calculated values in the <strong>Dive Profile</strong> panel, e.g. calculated cylinder
+  pressure, gas pressures and MOD. The HTML export contains a search option to
+  search the dive log. HTML export is specified on the second tab of the
+  Export dialog (image <strong>B</strong> above). A typical use of this option is to export
+  all one&#8217;s dives to a smartphone or a tablet where it would serve as a very
+  portable record of dives useful for dive companies that wish to verify the
+  dive history of a diver, often doing away with the need to carry one&#8217;s
+  original logbook with one when doing dives with dive companies.
+</p>
+</li>
+<li>
+<p>
+<em>Worldmap</em> format, an HTML file with a world map upon which each dive and
+  some information about it are indicated. This map is not editable. 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>
+<p>
+<em>General Settings</em>, under the HTML tab, provides the following options:
+</p>
+<div class="ulist"><ul>
+<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.
+</p>
+</li>
+<li>
+<p>
+Export Yearly Statistics: if this option is checked, a yearly statistics table will
+   be attached to the HTML exports.
+</p>
+</li>
+<li>
+<p>
+Export List only: a list of dives only (date, time, depth, duration) will be exported
+   and the detailed dive information, e.g. dive profile, will not be available.
+</p>
+</li>
+</ul></div>
+</li>
+<li>
+<p>
+Under <em>Style Options</em> some style-related options are available like font
+  size and theme.
+</p>
+</li>
+</ul></div>
+<div class="paragraph"><p>Export to other formats can be achieved through third party facilities, for
+instance <em>www.divelogs.de</em>.</p></div>
+</div>
+</div>
+</div>
+<div class="sect1">
+<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 for admission to further training courses or
+(sometimes) even diving sites. The security of the dive log is therefore
+critical. In order to have a dive log that is resistant to failure of a home
+computer hard drive, loss or theft of equipment, the Cloud is an obvious
+solution. This also has the added benefit that one can access one&#8217;s dive log
+from anywhere in the world without having to carry it with oneself. For this
+reason, facilities such as <em>divelogs.de</em> and <em>Diving Log</em> offer to store
+dive log information on the Internet.</p></div>
+<div class="paragraph"><p><em>Subsurface</em> includes access to a transparently integrated cloud storage
+back end that is available to all Subsurface users. Storing and retrieving a
+dive log from the cloud is no more difficult than accessing the dives on the
+local hard disk.  The only requirement is that one should first register as
+a user on the cloud.  To use <em>Subsurface cloud storage</em> , follow these
+steps:</p></div>
+<div class="sect2">
+<h3 id="_create_a_cloud_storage_account">9.1. Create a cloud storage account</h3>
+<div class="ulist"><ul>
+<li>
+<p>
+Open the <strong>Network Preferences</strong> by selecting <em>File</em> &#8594; <em>Preferences</em> &#8594; <em>Network</em>.
+</p>
+</li>
+<li>
+<p>
+In the section headed <em>Subsurface cloud storage</em>, enter an email address that
+   <em>Subsurface</em> can use for user registration.
+</p>
+</li>
+<li>
+<p>
+Enter a novel password that <em>Subsurface</em> will use to store the
+  dive log in the cloud.
+</p>
+</li>
+<li>
+<p>
+Click <em>Apply</em> to send the above email address and password to the
+  (remote) cloud server. The server responds by sending a verification PIN to
+  the above email address (This is the <strong>only</strong> occasion that <em>Subsurface</em> uses the
+  email address provided above). The <strong>Network Preferences</strong> dialog now has a new PIN text
+   box, not visible previously.
+</p>
+</li>
+<li>
+<p>
+Enter the PIN in the corresponding text box in the <strong>Network Preferences</strong> dialog
+(this field is only visible while the server is waiting for email
+address confirmation)
+</p>
+</li>
+<li>
+<p>
+Click <em>Apply</em> again. The <em>Subsurface cloud storage</em> account
+will be marked as verified and the <em>Subsurface cloud storage</em> service is initialised for use.
+</p>
+</li>
+</ul></div>
+</div>
+<div class="sect2">
+<h3 id="_using_em_subsurface_cloud_storage_em">9.2. Using <em>Subsurface cloud storage</em></h3>
+<div class="ulist"><ul>
+<li>
+<p>
+Once the cloud storage has been initialised, two new items appear in the
+   <em>File</em> menu of the main menu system: <em>Open cloud storage</em> and <em>Save to cloud storage</em>.
+These options allow the user to load and save data to the <em>Subsurface
+cloud storage</em> server.
+</p>
+</li>
+<li>
+<p>
+In the <em>Defaults Preferences</em> tab, one can select to use the <em>Subsurface cloud
+storage</em> data as one&#8217;s default data file by checking the check box marked <em>Cloud storage default file</em>.
+ This means that the data from
+the <em>Subsurface cloud storage</em> is loaded when <em>Subsurface</em> starts ans saved there when one closes <em>Subsurface</em>.
+</p>
+</li>
+<li>
+<p>
+<em>Subsurface</em> keeps a local copy of the data and the cloud facility remains fully
+functional even if used while disconnected to the Internet. <em>Subsurface</em> simply synchronises the
+data with the cloud server the next time ithe program is used while the computer is
+connected to the Internet.
+</p>
+</li>
+</ul></div>
+</div>
+<div class="sect2">
+<h3 id="S_Cloud_storage">9.3. Web access to <em>Subsurface cloud storage</em></h3>
+<div class="paragraph"><p>One of the nice side benefits of using <em>Subsurface cloud storage</em> is that
+one can also access one&#8217;s dive data from any web browser. Simply open
+<a href="https://cloud.subsurface-divelog.org"><em>https://cloud.subsurface-divelog.org</em></a>,
+log in with the same email and password, and you can see an HTML export of
+the last dive data that was synced to the <em>Subsurface cloud storage</em>. The
+dive information that is shown is only the contents of the recorded dive
+logs, NOT the calculated values shown in the <strong>Profile</strong> panel, including some
+cylinder pressures, deco ceilings and O<sub>2</sub>/He/N<sub>2</sub> partial pressures.</p></div>
+</div>
+<div class="sect2">
+<h3 id="_other_cloud_services">9.4. Other cloud services</h3>
+<div class="paragraph"><p>If one prefers not to use the integrated cloud storage of dive logs (and
+don&#8217;t need the web access), it is also simple to store dive logs in the
+cloud using several of the existing facilities on the Internet.  For
+instance <a href="http://www.dropbox.com/"><em>Dropbox</em></a> offers a free application that
+allows files on the Dropbox servers to be seen as a local folder on one&#8217;s
+desktop computer.</p></div>
+<div class="imageblock" style="text-align:center;">
+<div class="content">
+<img src="images/Cloud.jpg" alt="FIGURE: Dropbox folder" />
+</div>
+</div>
+<div class="paragraph"><p>The <em>Dropbox</em> program creates a copy of the <em>Dropbox</em> Internet Cloud content
+on one&#8217;s desktop computer. When the computer is connected to the Internet,
+the Internet content is automatically updated. Therefore both the <em>Open</em> and
+<em>Save</em> of dive logs are done using the local copy of the dive log in the
+local <em>Dropbox</em> folder, so there&#8217;s no need for a direct internet
+connection. If the local copy is modified, e.g. by adding a dive, the remote
+copy in the <em>Dropbox</em> server in the Cloud will be automatically updated
+whenever Internet access is available.</p></div>
+<div class="paragraph"><p>In this way a dive log in one&#8217;s <em>Dropbox</em> folder can be accessed seamlessly
+from the Internet and can be accessed from any place with Internet
+access. Currently there are no costs 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 on <em>Dropbox</em>, select <em>File &#8594; Save as</em> from the
+<em>Subsurface</em> main menu, navigate to the <em>Dropbox</em> folder and select the
+<em>Save</em> button. To access the dive log in <em>Dropbox</em>, select <em>File &#8594; Open
+Logbook</em> from the <em>Subsurface</em> main menu and navigate to the dive log file
+in the <em>Dropbox</em> folder and select the <em>Open</em> button.</p></div>
+<div class="paragraph"><p>Several paid services exist on the Internet (e.g. Google, Amazon) where the
+same process could be used for the Cloud-based storage of dive logs.</p></div>
+</div>
+</div>
+</div>
+<div class="sect1">
+<h2 id="S_PrintDivelog">10. Printing a dive log</h2>
+<div class="sectionbody">
+<div class="paragraph"><p><em>Subsurface</em> provides a simple and flexible interface to print a whole dive log or only a few selected dives.
+  Pre-installed templates or a custom written template can be used to choose where the data are fitted into the page.</p></div>
+<div class="paragraph"><p>Before printing, two decisions are required:</p></div>
+<div class="ulist"><ul>
+<li>
+<p>
+Should the whole dive log be printed or only part of it? If only part of the
+  dive log is required, then select the required dives from the <strong>Dive List</strong>
+  panel.
+</p>
+</li>
+<li>
+<p>
+If the dive profiles needs printing, what gas partial pressure information
+  should be shown? Select the appropriate toggle-buttons on the button bar to
+  the left of the <strong>Dive Profile</strong> panel.
+</p>
+</li>
+</ul></div>
+<div class="paragraph"><p>If <em>File &#8594; Print</em> is selected from the Main menu, the the dialogue below
+(image <strong>A</strong>) appears. Three specifications are needed to achieve the desired
+information and page layout:</p></div>
+<div class="imageblock" style="text-align:center;">
+<div class="content">
+<img src="images/Print1_f22.jpg" alt="FIGURE: Print dialogue" />
+</div>
+</div>
+<div class="olist arabic"><ol class="arabic">
+<li>
+<p>
+Under <em>Print type</em> select one of two options:
+</p>
+<div class="ulist"><ul>
+<li>
+<p>
+<em>Dive list print</em>: Print dives from the <strong>Dive List</strong> panel with profiles and
+  other information.
+</p>
+</li>
+<li>
+<p>
+<em>Statistics print</em>: Print yearly statistics of the dives.
+</p>
+</li>
+</ul></div>
+</li>
+<li>
+<p>
+Under <em>Print options</em> select:
+</p>
+<div class="ulist"><ul>
+<li>
+<p>
+Printing only the dives selected from the dive list prior to activating the
+  print dialogue by checking the box <em>Print only selected dives</em>. If this
+  check box is <strong>not</strong> checked all dives in the <strong>Dive List</strong> panel are printed.
+</p>
+</li>
+<li>
+<p>
+Printing in colour, achieved by checking the box with <em>Print in colour</em>. If
+  this check box is not checked, printing is in monochrome (grey scale).
+</p>
+</li>
+</ul></div>
+</li>
+</ol></div>
+<div class="paragraph"><p>Under <em>Template</em> select a template to be used as the page layout. There are
+several templates (see image <strong>B</strong>, above).</p></div>
+<div class="ulist"><ul>
+<li>
+<p>
+<em>Table</em>: This prints a summary table of all dives selected (see below).
+</p>
+</li>
+</ul></div>
+<div class="imageblock" style="text-align:center;">
+<div class="content">
+<img src="images/Print_summarylist_f22.jpg" alt="FIGURE: Print summary table" />
+</div>
+</div>
+<div class="ulist"><ul>
+<li>
+<p>
+<em>Flow layout</em>: Print the text associated with each dive without printing the
+  dive profiles
+     of each dive (see below):
+</p>
+</li>
+</ul></div>
+<div class="imageblock" style="text-align:center;">
+<div class="content">
+<img src="images/Print_flow_layout_f22.jpg" alt="FIGURE: Print flow layout" />
+</div>
+</div>
+<div class="ulist"><ul>
+<li>
+<p>
+<em>One Dive</em>: Print one dive per page, also showing the dive profile (see
+  below)
+</p>
+</li>
+</ul></div>
+<div class="imageblock" style="text-align:center;">
+<div class="content">
+<img src="images/print2_f22.jpg" alt="FIGURE: Print one dive / page" />
+</div>
+</div>
+<div class="ulist"><ul>
+<li>
+<p>
+<em>Two Dives</em>: Print two dives per page, also showing the dive profiles.
+</p>
+</li>
+<li>
+<p>
+<em>Six Dives</em>: Print six dives per page, also showing the dive profiles.
+</p>
+</li>
+</ul></div>
+<div class="paragraph"><p>Users can <em>Preview</em> the printed page by selecting the <em>Preview</em> button on
+the dialogue (see image <strong>A</strong> at the start of this section). After preview,
+changes to the options in the print dialogue can be made, resulting in a
+layout that fits personal taste.</p></div>
+<div class="paragraph"><p>Next, select the <em>Print</em> button (see image <strong>A</strong> at the start of this
+section). This activates the regular print dialogue used by the user
+operating system, allowing one to choose a printer and to set its properties
+(see image below):</p></div>
+<div class="imageblock" style="text-align:center;">
+<div class="content">
+<img src="images/Print_print_f22.jpg" alt="FIGURE: Print dialog" />
+</div>
+</div>
+<div class="paragraph"><p>Set the print resolution of the printer to an appropriate value by changing
+the printer <em>Properties</em>. Finally, select the <em>Print</em> button to print the
+dives.  Below is a (rather small) example of the output for one particular
+page.</p></div>
+<div class="imageblock" style="text-align:center;">
+<div class="content">
+<img src="images/Printpreview.jpg" alt="FIGURE: Print preview page" />
+</div>
+</div>
+<div class="sect2">
+<h3 id="_créer_un_modèle_d_8217_impression_personnalisé_avancé">10.1. Créer un modèle d&#8217;impression personnalisé (avancé)</h3>
+<div class="paragraph"><p>Writing a custom template is an effective way to produce highly customized
+printouts. Subsurface uses HTML templates to render printing. One can create
+a template, export a new template, import an existing template and delete an
+existing template by using the appropriate buttons under the <em>Template</em>
+dropdown list in the print dialogue. See <a href="#S_APPENDIX_E">APPENDIX E</a> for
+information on how to write or modify a template.</p></div>
+</div>
+</div>
+</div>
+<div class="sect1">
+<h2 id="S_Configure">11. Configurer un ordinateur de plongée</h2>
+<div class="sectionbody">
+<div class="paragraph"><p><em>Subsurface</em> permet de configurer son ordinateur de plongée. Actuellement,
+les familles d&#8217;ordinateurs supportés sont Heinrichs-Weikamp (OSTC 2, OSTC 3)
+et Suunto Vyper (Stinger, Mosquito, D3, Vyper, Vytec, Cobra, Gekko et
+Zoop). De nombreux paramètres de ces ordinateurs de plongée peuvent être
+lues et modifiées. La première étape est de s&#8217;assurer que les pilotes pour
+votre ordinateur de plongée sont installés (également nécessaire pour
+télécharger les plongées) et que le nom de périphérique de l&#8217;ordinateur de
+plongée est connu. Voir
+<a href="#_appendix_a_operating_system_specific_information_for_importing_dive_information_from_a_dive_computer">ANNEXE A</a> pour plus d&#8217;informations sur la manière de procéder.</p></div>
+<div class="paragraph"><p>Une fois que l&#8217;ordinateur de plongée est connecté à <em>Subsurface</em>,
+sélectionner <em>Fichier &#8594; Configurer l&#8217;ordinateur de plongée</em>, à partir du
+menu principal. Fournir le nom du périphérique dans le champ en haut du
+panneau de configuration et sélectionner le bon modèle d&#8217;ordinateur de
+plongée à partir du panneau à gauche (voir l&#8217;image ci-dessous).</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>En utilisant les boutons appropriés du panneau de configuration, les actions
+suivantes peuvent être réalisées :</p></div>
+<div class="ulist"><ul>
+<li>
+<p>
+<strong>Récupérer les détails disponibles</strong>. Cela charge la configuration existante à partir de l&#8217;ordinateur de plongée
+   dans <em>Subsurface</em>, en l&#8217;affichant dans le panneau de configuration.
+</p>
+</li>
+<li>
+<p>
+<strong>Enregistrer les modifications sur le périphérique</strong>. Cela change la configuration de l&#8217;ordinateur
+   de plongée pour correspondre aux informations affichées dans le panneau de configuration.
+</p>
+</li>
+<li>
+<p>
+<strong>Sauvegarder</strong>. Cela enregistre la configuration dans un fichier. <em>Subsurface</em> demande
+   l&#8217;emplacement et le nom du fichier pour enregistrer les informations.
+</p>
+</li>
+<li>
+<p>
+<strong>Restaurer une sauvegarde</strong>. Cela charge les informations à partir d&#8217;un fichier de sauvegarde et l&#8217;affiche
+   dans le panneau de configuration.
+</p>
+</li>
+<li>
+<p>
+<strong>Mettre à jour le firmware</strong>. Si un nouveau firmware est disponible pour l&#8217;ordinateur de plongée,
+   il sera chargé dans l&#8217;ordinateur de plongée.
+</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 user-definable settings within <em>Subsurface</em>, found by
+selecting <em>File &#8594; Preferences</em>. The settings are performed in seven groups:
+<strong>Defaults</strong>, <strong>Units</strong>, <strong>Graph</strong>, <strong>Language</strong> and <strong>Network</strong>, <strong>Facebook</strong> and
+<strong>Georeference</strong>, all of which operate on the same principles: the user must
+specify the settings that are to be changed, then these changes are saved
+using the <strong>Apply</strong> button. After applying all the new settings users can then
+leave the settings panel by selecting <strong>OK</strong>. If <strong>Discard</strong> is selected,
+changes to the preferences are not saved.</p></div>
+<div class="sect2">
+<h3 id="_defaults">12.1. Defaults</h3>
+<div class="paragraph"><p>There are several settings in the <strong>Defaults</strong> panel:</p></div>
+<div class="imageblock" style="text-align:center;">
+<div class="content">
+<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.
+</p>
+</li>
+<li>
+<p>
+<strong>Dives</strong>: For the <em>Default Dive File</em> one needs to specify the directory and
+     file name of one&#8217;s
+     electronic dive log book. This is a file with filename extension of either <em>.xml</em> or <em>ssrf</em>. When
+     launched, <em>Subsurface</em> will automatically load the specified dive log book. There are three options:
+</p>
+<div class="ulist"><ul>
+<li>
+<p>
+<em>No default file</em>: When checked, <em>Subsurface</em> does not automatically load a dive log at startup.
+</p>
+</li>
+<li>
+<p>
+<em>Local default file</em>: When checked, <em>Subsurface</em> automatically loads a dive log from the local hard disk
+       as described above.
+</p>
+</li>
+<li>
+<p>
+<em>Cloud storage default file</em>: When checked, <em>Subsurface automatically loads the dive log from the cloud
+       device that was initialised using the <strong>Preferences</strong> _Network</em> tab (see below).
+</p>
+</li>
+</ul></div>
+</li>
+<li>
+<p>
+<strong>Display invalid</strong>:  Dives can be marked as invalid (when a user wishes to hide
+     dives that he/she doesn&#8217;t consider valid dives, e.g. pool dives, but still want to
+     keep them in the dive log). This controls whether those dives are displayed in
+     the dive list.
+</p>
+</li>
+<li>
+<p>
+<strong>Default cylinder</strong>: Specify the default cylinder listed in
+     the <strong>Equipment</strong> tab of the <strong>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, and a 0 value representing no animation
+     at all.
+</p>
+</li>
+<li>
+<p>
+<strong>Clear all settings</strong>: As indicated in the button below this heading, all settings are
+     cleared and set to default values.
+</p>
+</li>
+</ul></div>
+</div>
+<div class="sect2">
+<h3 id="_units">12.2. Units</h3>
+<div class="imageblock" style="text-align:center;">
+<div class="content">
+<img src="images/Pref2_f20.jpg" alt="FIGURE: Preferences Units page" />
+</div>
+</div>
+<div class="paragraph"><p>Here users can choose between metric and imperial units of depth, pressure,
+volume, temperature and mass. By selecting the Metric or Imperial radio
+button at the top, one can specify that all units are in the chosen
+measurement system.  Alternatively, if one selects the <strong>Personalise</strong> radio
+button, units can be selected independently, with some units in the metric
+system and others in imperial.</p></div>
+<div class="paragraph"><p>Irrespective of the above settings, dive time measurements can be either in
+seconds or minutes.  Choose the appropriate option. GPS coordinates can be
+represented either as traditional coordinates (degrees, minutes, seconds) or
+as decimal degrees Choose the appropriate option.</p></div>
+</div>
+<div class="sect2">
+<h3 id="_graph">12.3. Graph</h3>
+<div class="imageblock" id="S_CCR_options" style="text-align:center;">
+<div class="content">
+<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>
+<div class="paragraph"><p><strong>Show</strong>: Here users can specify the amount of information shown as part of
+the dive profile:
+<strong> Thresholds: <em>Subsurface</em> can display the nitrogen, oxygen and the helium partial pressures during
+   the dive, enabled by using the toolbar on the left hand side of the <strong>Dive Profile</strong>
+   panel. For each of these graphs users can specify a threshold value on the right-hand side of the
+   Preferences panel. If any of the graphs go above the specified threshold level, the graph is
+   highlighted in red, indicating that the particular partial pressure threshold has been exceeded.
+</strong> <em>Max pO<sub>2</sub> is used for calculating the MOD when displaying the maximum operative depth (MOD)
+   for a dive. Specify an appropriate partial pressure. A value of 1.4 is commonly used.
+<strong> _Draw dive computer reported ceiling red</em>: This checkbox allows exactly what it says. By default
+   the computer reported ceiling is shown in white.
+   Not all dive computers report ceiling values. If the dive computer does report it, it may differ
+   from the ceilings calculated by <em>Subsurface</em> because of the different algorithms and
+   gradient factors, as well as the dynamic way that a
+   dive computer can calculate ceilings during a dive.
+</strong> <em>Show unused cylinders in Equipment Tab</em>: This checkbox allows display of information about unused cylinders when viewing the <strong>Equipment Tab</strong>. Conversely, if this box is not checked, and if any cylinders entered using the <strong>Equipment Tab</strong> are not used (e.g. there was no gas switch to such a cylinder), then these cylinders are omitted from that list.
+<strong>*  <em>Show average depth</em>: If this box is checked, the *Dive Profile</strong> panel contains a grey line that indicates
+    the mean depth of the dive up to any time instant during the dive. Normally this is a u-shaped line indicating the deepest mean depth just before the
+   ascent.</p></div>
+<div class="ulist"><ul>
+<li>
+<p>
+<strong>Misc</strong>:
+</p>
+<div class="ulist" id="GradientFactors_Ref"><ul>
+<li>
+<p>
+Gradient Factors (GFLow and GFHigh):* Set the <em>gradient factors</em> used while diving. GF_Low is
+   the gradient factor at depth and GF_High is used just below the surface.
+   At intermediate depths gradient factors between GF_Low and GF_High are used.
+   Gradient factors add conservatism to the nitrogen exposure during a dive, in a
+   similar way that many dive computers have a conservatism setting. The lower
+   the value of a gradient factor, the more conservative the calculations are with
+   respect to nitrogen loading and the deeper the ascent ceilings are. Gradient
+   factors of 20/60 are considered conservative and values of 70/90 are considered
+   harsh. Checking the <strong>GFLow at max depth</strong> box causes GF_Low to be used at the
+   deepest depth of a dive. If this box is not checked, GF_Low is applied at
+   all depths deeper than the first deco stop. For more information see:
+</p>
+<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>
+</p>
+</li>
+<li>
+<p>
+<a href="http://www.rebreatherworld.com/general-and-new-to-rebreather-articles/5037-gradient-factors-for-dummies.html">Gradient factors for dummies, by Kevin Watts</a>
+</p>
+</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>  maintained
+    during a particular dive. Setpoint changes during the dive can be added via the
+    profile context menu.
+</p>
+</li>
+<li>
+<p>
+<em>pSCR O<sub>2</sub> metabolism rate:</em> For a semiclosed rebreather (pSCR) system, this is the
+    volume of oxygen used by a diver during a 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. A 1:10 ratio is commonly used.
+</p>
+</li>
+</ul></div>
+</li>
+</ul></div>
+</div>
+<div class="sect2">
+<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_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 will be the correct setting; with this <em>Subsurface</em> simply runs in the
+same language / country settings as the underlying operating system. If this
+is for some reason undesirable one can uncheck this checkbox and pick a
+language / country combination from the list of included localizations. The
+<em>Filter</em> text box allows one to list similar languages. For instance there
+are several system variants of English or French. <strong>This particular
+preference requires a restart of <em>Subsurface</em> to take effect</strong>.</p></div>
+</div>
+<div class="sect2">
+<h3 id="_network">12.5. Network</h3>
+<div class="paragraph"><p>This panel facilitates communication between <em>Subsurface</em> and data sources
+on the Internet.  This is important, for instance, when <em>Subsurface</em> needs
+to communicate with Internet services such as Cloud storage or the
+<a href="#S_Companion"><em>Subsurface Companion app</em></a>. These Internet requirements are
+determined by one&#8217;s type of connection to the Internet and by the Internet
+Service Provider (ISP) used.  One&#8217;s ISP should provide the appropriate
+information.</p></div>
+<div class="imageblock" style="text-align:center;">
+<div class="content">
+<img src="images/Pref5_f20.jpg" alt="FIGURE: Preferences Network page" />
+</div>
+</div>
+<div class="paragraph"><p>This dialogue has three sections:</p></div>
+<div class="ulist"><ul>
+<li>
+<p>
+<em>Proxy type</em>:
+If a proxy server is used for Internet access, the type of proxy needs to be selected from the dropdown list,
+after which the IP address of the host and the appropriate port number should
+be provided. If the proxy server uses authentication, the appropriate userID and
+password are required so that <em>Subsurface</em> can automatically pass
+through the proxy server to access the Internet. This information is usually obtained
+from one&#8217;s ISP.
+</p>
+</li>
+<li>
+<p>
+<em>Subsurface cloud storage</em>: To store one&#8217;s dive log in the cloud, a valid email address
+   and password are required. This allows <em>Subsurface</em> to email security information
+   regarding cloud storage to a user, and to set up the cloud storage appropriately.
+   Two additional options are given:
+</p>
+<div class="ulist"><ul>
+<li>
+<p>
+<em>Sync to cloud in the background</em>: This option allows saving of dive information to the cloud storage
+   while the user performs other tasks within <em>Subsurface</em>.
+</p>
+</li>
+<li>
+<p>
+<em>Save password locally</em>: This allows local storage of the cloud storage password. Note that this
+   information is saved in raw text form, not encoded in any way.
+</p>
+</li>
+</ul></div>
+</li>
+<li>
+<p>
+<em>Subsurface web service</em>: When one subscribes to the <a href="#S_Companion">Subsurface web service</a>, a very
+     long and hard-to-remember userID is issued. This is the place to save that userID. By
+     checking the option <em>Save User ID locally?</em>, one ensures that a local copy of that userID
+     is saved.
+</p>
+</li>
+</ul></div>
+</div>
+<div class="sect2">
+<h3 id="S_Facebook">12.6. Accès Facebook</h3>
+<div class="paragraph"><p>Ce panneau vous permet de vous connecter à votre compte Facebook pour
+transférer des informations de Subsurface vers Facebook.</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>Si un identifiant Facebook et un mot de passe valides ont été fournis, une
+connexion vers Facebook est créée. Cette connexion est fermée lorsque
+Subsurface est fermé. Pour le moment, la case à cocher nommée "Conserver ma
+connexion à Subsurface", sur l'écran de connexion, n&#8217;a aucun
+effet. Reportez-vous à la section <a href="#S_facebook">Export des profils de
+plongée vers Facebook</a> pour plus d&#8217;informations.</p></div>
+</div>
+<div class="sect2">
+<h3 id="_georeference">12.7. Georeference</h3>
+<div class="paragraph"><p><em>Subsurface</em> provides a geo-lookup service (that is, given the coordinates
+of a dive site (derived from a click on the <strong>Dive Map panel</strong> at the bottom
+right of the <em>Subsurface</em> window, or from a GPS instrument or from the
+<em>Subsurface</em> Companion app), a lookup on the Internet is performed to find
+the name of the closest known location. Obviously this function only works
+if <em>Subsurface</em> has an Internet connection. The preference of the dive site
+name can be configured, e.g. <em>Country/State/City</em> or <em>City/State/Country</em>
+(see image below).</p></div>
+<div class="imageblock" style="text-align:center;">
+<div class="content">
+<img src="images/Pref7_f20.jpg" alt="FIGURE: Facebook login panel" />
+</div>
+</div>
+</div>
+</div>
+</div>
+<div class="sect1">
+<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="sidebarblock">
+<div class="content">
+<div class="admonitionblock">
+<table><tr>
+<td class="icon">
+<img src="images/icons/warning2.png" alt="Warning" />
+</td>
+<td class="content">The <em>Subsurface</em> dive planner IS CURRENTLY EXPERIMENTAL and assumes the user
+is already familiar with the <em>Subsurface</em> user interface. It is explicitly
+used under the following conditions:</td>
+</tr></table>
+</div>
+<div class="ulist"><ul>
+<li>
+<p>
+The user is conversant with dive planning and has the necessary training to
+  perform dive planning.
+</p>
+</li>
+<li>
+<p>
+The user plans dives within his/her certification limits.
+</p>
+</li>
+<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.
+</p>
+</li>
+<li>
+<p>
+The safety of a dive plan depends heavily on the way in which the planner is
+  used.
+</p>
+</li>
+<li>
+<p>
+The user is familiar with the user interface of <em>Subsurface</em>.
+</p>
+</li>
+<li>
+<p>
+A user who is not absolutely sure about any of the above requirements should
+  not use this feature.
+</p>
+</li>
+</ul></div>
+</div></div>
+<div class="sect2">
+<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 Notes.</p></div>
+<div class="paragraph"><p>At the top right hand is a green <strong>design panel</strong> upon which the profile of
+the dive can be manipulated directly by dragging and clicking as explained
+below. This feature makes the <em>Subsurface</em> dive planner unique in ease of
+use.</p></div>
+<div class="paragraph"><p>At the bottom right is a text panel with a heading of <em>Dive Plan
+Details</em>. This is where the details of the dive plan are provided in a way
+that can easily be copied to other software. This is also where 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_f20.jpg" alt="FIGURE: Dive planner startup window" />
+</div>
+</div>
+</div>
+<div class="sect2">
+<h3 id="_open_circuit_dives">13.2. Open circuit dives</h3>
+<div class="ulist"><ul>
+<li>
+<p>
+Towards the centre bottom of the planner (circled in blue in the image
+   above) is a dropbox with three options. Select the appropriate one of these:
+</p>
+<div class="ulist"><ul>
+<li>
+<p>
+Open Circuit (the default)
+</p>
+</li>
+<li>
+<p>
+CCR
+</p>
+</li>
+<li>
+<p>
+pSCR
+</p>
+</li>
+</ul></div>
+</li>
+<li>
+<p>
+Choose the Open Circuit option.
+</p>
+</li>
+<li>
+<p>
+In the top left-hand area of the planning screen, ensure that the constant
+  dive parameters are appropriate. These are: Start date and time of the
+  intended dive, Atmospheric Pressure and Altitude above sea level of the dive
+  site. The atmospheric pressure can also be entered as an altitude in metres,
+  assuming a sea-level 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 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 right-hand of the
+  dialogue.
+</p>
+</li>
+<li>
+<p>
+The profile of the planned dive can be created in two ways:
+</p>
+<div class="ulist"><ul>
+<li>
+<p>
+Drag the waypoints (the small white circles) on the existing dive profile in
+    a way to represent the dive. Additional waypoints can be created by
+    double-clicking the existing dive profile. Waypoints can be deleted by
+    right-clicking a particular waypoint and selecting the <em>delete</em> item from
+    the resulting context menu.
+</p>
+</li>
+<li>
+<p>
+The most efficient way to create a dive profile is to enter the appropriate
+    values into the table marked <em>Dive planner points</em>. The first line of the
+    table represents the duration and the final depth of the descent from the
+    surface. Subsequent segments describe the bottom phase of the dive.  The <em>CC
+    set point</em> column is only relevant for closed circuit divers.  The ascent is
+    usually not specified because this is what the planner is supposed to
+    calculate.  Add additional segments to the profile by selecting the "+" icon
+    at the top right hand of the table. Segments entered into the <em>Dive planner
+    points</em> table automatically appear in the <strong>Dive Profile</strong> diagram.
+</p>
+</li>
+</ul></div>
+</li>
+</ul></div>
+<div class="sect3">
+<h4 id="_recreational_dives">13.2.1. Recreational dives</h4>
+<div class="paragraph"><p>Recreational mode is what comes closest to planning a dive based on the
+non-decompression limit (NDL).  It computes the maximal time a diver can
+stay at the current depth without incurring any mandatory decompression
+stops and without using more than the existing gas (minus a reserve). The
+planner automatically takes into account the nitrogen load incurred in
+previous dives. But conventional dive tables are also used in a way that can
+take into account previous dives. Why use a dive planner for recreational
+dives? Using recreational dive tables, the maximum depth of a dive is taken
+into account. However, few dives are undertaken at a constant depth
+corresponding to the maximum depth (i.e. a "square" dive profile). This
+means that dive tables overestimate the nitrogen load incurred during
+previous dives. The <em>Subsurface</em> dive planner calculates nitrogen load
+according to the real dive profiles of all uploaded previous dives, in a
+similar way as dive computers calculate nitrogen load during a dive. This
+means that the diver gets <em>credit</em> in terms of nitrogen loading for not
+remaining at maximum depth during previous dives, enabling planning of a
+longer subsequent dive. For the planner to work it is therefore crucial to
+upload all previous dives onto <em>Subsurface</em> before performing dive planning.</p></div>
+<div class="paragraph"><p>To plan a dive, the appropriate settings need to be defined.</p></div>
+<div class="paragraph"><p>Ensure that the date and time is set to that of the intended dive. This
+allows calculation of the nitrogen load incurred during previous dives.</p></div>
+<div class="ulist"><ul>
+<li>
+<p>
+Immediately under the heading <em>Planning</em> are two checkboxes <em>Recreational</em>
+  and <em>Safety Stop</em>.  Check these two boxes.
+</p>
+</li>
+<li>
+<p>
+Then define the cylinder size, the gas mixture (air or % oxygen) and the
+  starting cylinder pressure in the top left-hand section of the planner under
+  <em>Available gases</em>.
+</p>
+</li>
+<li>
+<p>
+The planner calculates whether the specified cylinder contains enough
+  air/gas to complete the planned dive. In order for this to be realistic,
+  under <em>Gas options</em>, specify an appropriate surface air consumption (SAC)
+  rate for <em>Bottom SAC</em>. Suitable values are between 15 l/min and 30 l/min,
+  with novice divers or difficult dives requiring SAC rates closer to 30l/min.
+</p>
+</li>
+<li>
+<p>
+Define the amount of gas that the cylinder must have at the end of the
+  bottom section of the dive just before ascent. A value of 50 bar is often
+  used. The reason for this reserve gas is to provide for the possible need
+  need to bring one&#8217;s buddy to the surface using gas sharing. How much gas is
+  used in sharing depends on the depth of the ascent. This can be a bit hard
+  to estimate, so most agencies assume a fixed amount of gas, or actually of
+  pressure e.g. 40 or 50 bar or 25% or 33% (rule of thirds). But <em>Subsurface</em>
+  can do better because it knows about the ascent and that is why we add the
+  amount of gas during the ascent (i.e. the "deco gas“).  Subsurface still
+  uses a fixed pressure „reserve“ but that is supposed to be for the
+  additional gas used around the realisation that there is a problem and one&#8217;s
+  pulse rate goes up when one starts to buddy breathe. This reserve amount is
+  user configurable.
+</p>
+</li>
+<li>
+<p>
+Define the depth of the dive by dragging the waypoints (white dots) on the
+  dive profile or (even better) defining the appropriate depths using the
+  table under <em>Dive planner points</em> as desribed under the previous heading. If
+  this is a multilevel dive, set the appropriate dive depths to represent the
+  dive plan by adding waypoints to the dive profile or by adding appropriate
+  dive planner points to the <em>Dive Planner Points</em> table. <em>Subsurface</em> will
+  automatically extend the bottom section of the dive to the maximum duration
+  within the no-decompression limits (NDL).
+</p>
+</li>
+<li>
+<p>
+The ascent speed can be changed. The default ascent speeds are those
+  considered safe for recreational divers.
+</p>
+</li>
+</ul></div>
+<div class="paragraph"><p>The dive profile in the planner indicates the maximum dive time within
+no-deco limits using the Bühlmann ZH-L16 algorithm and the gas and depth
+settings specified as described above. The <em>Subsurface</em> planner allows rapid
+assessment of dive duration as a function of dive depth, given the nitrogen
+load incurred during previous dives. The dive plan includes estimates of the
+amount of air/gas used, depending on the cylinder settings specified under
+<em>Available gases</em>. If the initial cylinder pressure is set to 0, the dive
+duration shown is the true no-deco limit (NDL) without taking into account
+gas used during the dive. If the surface above the dive profile is RED it
+means that recreational dive limits are exceeded and either the dive
+duration or the dive depth needs to be reduced.</p></div>
+<div class="paragraph"><p>Below is an image of a dive plan for a recreational dive at 30
+metres. Although the no-deco limit (NDL) is 23 minutes, the duration of the
+dive is limited by the amount of air in the cylinder, reflected by the
+information in the text box at the bottom right of the panel that requires
+sufficient air for buddy-sharing during the ascent.</p></div>
+<div class="imageblock" style="text-align:center;">
+<div class="content">
+<img src="images/rec_diveplan.jpg" alt="FIGURE: A recreational dive plan: setup" />
+</div>
+</div>
+</div>
+<div class="sect3">
+<h4 id="_non_recreational_open_circuit_dives_including_decompression">13.2.2. Non-recreational open circuit dives, including decompression</h4>
+<div class="paragraph"><p>Non-recreational dive planning involves exceeding the no-deco limits and/or
+using multiple breathing gases.  Such dives are planned in three stages:</p></div>
+<div class="paragraph"><p><strong>a) Nitrogen management</strong>: This is performed by specifying the rates for descent and ascent,
+as well as the deco model (GFLow, GFHigh or Conservatism level) under the headings <em>Rates</em> and <em>Planning</em>
+to the bottom left of the planning screen. Two deco models are supported the Bühlmann model and the VPM-B
+model. Select one of the two models. When selecting the Bühlmann model, the gradient factors (GF_high and GF_low
+need to be specified. Initially, the GFHigh and GFLow values in the <em>Preferences</em>
+panel of <em>Subsurface</em> is used. If these are changed within the planner (see <em>Gas Options</em> within
+the planner), the new values are
+used without changing the original values in the <em>Preferences</em>. Gradient Factor settings strongly affect the calculated ceilings and their depths.
+A very low GFLow value brings about decompression stops early on during the dive.
+ ** For more information about Gradient factors, see the section on <a href="#S_GradientFactors">Gradient Factor Preference settings</a>.</p></div>
+<div class="paragraph"><p>If the VPM-B model is selected, the Conservatism_level needs to be specified
+on a scale of 0 (least conservative) to 4 (most conservative).  This model
+tends to give deco stops at deeper levels than the Bühlmann model and often
+results in slightly shorter dive durations than the Bühlmann model. When
+selecting one of these models, keep in mind that they are NOT exact
+physiological models but only mathematical models that appear to work in
+practice.</p></div>
+<div class="paragraph"><p>For more information external to this manual see:</p></div>
+<div class="ulist"><ul>
+<li>
+<p>
+<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>
+</p>
+</li>
+<li>
+<p>
+<a href="http://www.rebreatherworld.com/general-and-new-to-rebreather-articles/5037-gradient-factors-for-dummies.html">Gradient
+   factors for dummies, by Kevin Watts</a>
+<a href="http://www.amazon.com/Deco-Divers-Decompression-Theory-Physiology/dp/1905492073/ref=sr_1_1?s=books&amp;ie=UTF8&amp;qid=1403932320&amp;sr=1-1&amp;keywords=deco+for+divers"><em>Deco
+for Divers</em>, by Mark Powell (2008). Aquapress</a> Southend-on-Sea, UK. ISBN 10:
+1-905492-07-3.  Un excellent livre non technique qui traite à la fois des
+modèles de décompression Bühlmann et VPM-B.
+</p>
+</li>
+</ul></div>
+<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 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></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 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 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 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></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 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. It is NOT necessary to specify the ascent
+part of the dive since the planner calculates this, based on the settings
+that have been specified.  If any of the management limits (for nitrogen,
+oxygen or gas) is exceeded, the surface above the dive profile changes from
+BLUE to RED.</p></div>
+<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 <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. 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></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></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_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 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 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>Notes</em> section of the dive
+planner, immediately to the left of the <em>Dive Plan Details</em>. If a <em>Verbatim
+dive plan</em> is requested, a detailed sentence-level explanation of the dive
+plan is given. If any of the management specifications have been exceeded
+during the planning, a warning message is printed underneath the dive plan
+information.</p></div>
+<div class="paragraph"><p>If the option <em>Display segment duration</em> is checked, then the duration of
+each depth level is indicated in the <em>Dive Plan Details</em>. This duration
+INCLUDES the transition time to get to that level. However, if the <em>Display
+transition in deco</em> option is checked, the transitions are shown separately
+from the segment durations at a particular level.</p></div>
+</div>
+</div>
+<div class="sect2">
+<h3 id="_planning_pscr_dives">13.3. Planning pSCR dives</h3>
+<div class="paragraph"><p>To plan a dive using a passive semi-closed rebreather (pSCR), select <em>pSCR</em> rather than
+<em>Open circuit</em> in the dropdown list.
+The parameters of the pSCR dive can be set by selecting  <em>File &#8594;   Preferences &#8594;   Graph</em>
+from the main menu, where the gas consumption calculation takes into account the pSCR dump
+ratio (default 10:1) as well as the metabolism rate. The calculation also takes the oxygen drop
+accross the mouthpiece of the rebreather into account. If the
+pO<sub>2</sub> drops below what is considered a save value, a warning appears in the <em>Dive plan
+details</em>. A typical pSCR configuration is with a single cylinder and one or more bail-out
+cylinders. Therefore the setup of the <em>Available gases</em> and the <em>Dive planner points</em> tables
+are very similar to that of a CCR dive plan, described below. However, no oxygen setpoints
+are specified for pSCR dives. Below is a dive plan for a pSCR dive. The dive is comparable
+to that of the CCR dive below, but note the longer ascent duration due to the lower oxygen
+in the loop due to the oxygen drop across the mouthpiece of the pSCR equipment.</p></div>
+<div class="imageblock" style="text-align:center;">
+<div class="content">
+<img src="images/Planner_pSCR1_f20.jpg" alt="FIGURE: Planning a pSCR dive: setup" />
+</div>
+</div>
+</div>
+<div class="sect2">
+<h3 id="_planning_ccr_dives">13.4. Planning CCR dives</h3>
+<div class="paragraph"><p>To plan a dive using a closed circuit rebreather, select the <em>CCR</em> option in
+the dropdown list, circled in blue in the image below.</p></div>
+<div class="paragraph"><p><strong>Available gases</strong>: In the <em>Available gases</em> table, enter the cylinder information for the
+diluent cylinder and for any bail-out cylinders. Do NOT enter the information for the oxygen
+cylinder since it is implied when the <em>CCR</em> dropdown selection is made.</p></div>
+<div class="paragraph"><p><strong>Entering setpoints</strong>: Specify a default setpoint in the Preferences tab, by selecting <em>File &#8594;  Preferences &#8594;  Graph</em> from
+the main menu. All user-entered segments in the <em>Dive planner points</em> table
+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="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, 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">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> calculates the gas loading figures correctly and
+the effect of the first dive is evaluated on later dives.</p></div>
+<div class="paragraph"><p>If one has just completed a long/deep dive and is planning another dive,
+then highlight, in the <strong>Dive List</strong>, the dive that has just been completed
+and then activate the planner. Depending on the start time of the planned
+dive, the planner takes into account the gas loading incurred during the
+completed dive and allows planning within these limitations.</p></div>
+<div class="paragraph"><p>If only a few standard configurations are used (e.g. in GUE), then a
+template dive can be created conforming to one of the configurations. If one
+now wishes to plan a dive using this configuration, just highlight the
+template dive in the <strong>Dive List</strong> and activate the planner: the planner takes
+into account the configuration in the highlighted dive.</p></div>
+</div>
+<div class="sect2">
+<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>
+<div class="paragraph"><p>Dive plans have many characteristics in common with dive logs (dive profile,
+dive notes, etc).  After a dive plan has been saved, the dive details and
+gas calculations are saved in the <strong>Notes</strong> tab. While a dive plan is being
+designed, it can be printed using the <em>Print</em> button in the dive
+planner. This prints the dive details and gas calculations in the <em>Dive Plan
+Details</em> panel of the dive planner. However, after the plan has been saved,
+it is represented in a way very similar to a dive log and the gas
+calculations cannot be 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 or by copy and
+paste to a word processor.</p></div>
+</div>
+</div>
+</div>
+<div class="sect1">
+<h2 id="_description_des_éléments_du_menu_principal_de_subsurface">14. Description des éléments du menu principal de Subsurface</h2>
+<div class="sectionbody">
+<div class="paragraph"><p>Cette section décrit les fonctions et les opérations des éléments du menu
+principal de Subsurface. Plusieurs éléments ci-dessous sont des liens vers
+des sections de ce manuel traitant des opérations relatives.</p></div>
+<div class="sect2">
+<h3 id="_fichier">14.1. Fichier</h3>
+<div class="ulist"><ul>
+<li>
+<p>
+<a href="#S_NewLogbook"><em>Nouveau carnet de plongée</em></a> - Fermer le carnet de plongée
+  actuellement ouvert et supprime toutes les informations de plongées.
+</p>
+</li>
+<li>
+<p>
+<em>Ouvrir un carnet de plongée</em> - Cela ouvre une fenêtre pour sélectionner le
+  carnet de plongée à ouvrir.
+</p>
+</li>
+<li>
+<p>
+<em>Open cloud storage</em> - Open the dive log previously saved in
+  <a href="#S_Cloud_storage"><em>Cloud storage</em></a>.
+</p>
+</li>
+<li>
+<p>
+<em>Sauvegarder</em> - Enregistrer le carnet de plongée qui est actuellement
+  ouvert.
+</p>
+</li>
+<li>
+<p>
+<em>Save to cloud storage</em> - Save the current dive log to
+  <a href="#S_Cloud_storage"><em>Cloud storage</em></a>.
+</p>
+</li>
+<li>
+<p>
+<em>Enregsitrer sous</em> - Enregistrer le carnet actuel sous un nom différent.
+</p>
+</li>
+<li>
+<p>
+<em>Fermer</em> - Fermer le carnet de plongée actuellement ouvert.
+</p>
+</li>
+<li>
+<p>
+<a href="#S_ExportLog"><em>Exporter</em></a> - Exporter le carnet de plongée actuellement
+  ouvert (ou les plongées sélectionnées dans le carnet) vers un des nombreux
+  formats.
+</p>
+</li>
+<li>
+<p>
+<a href="#S_PrintDivelog"><em>Imprimer</em></a> - Imprimer le carnet de plongée actuellement
+  ouvert.
+</p>
+</li>
+<li>
+<p>
+<a href="#S_Preferences"><em>Préférences</em></a> - Définir les  préférences de <em>Subsurface</em>.
+</p>
+</li>
+<li>
+<p>
+<a href="#S_FindMovedImages"><em>Find moved images</em></a> - If photos taken during dives
+  have been moved to
+      a different disk or directory, locate them and link them to the appropriate
+      dives.
+</p>
+</li>
+<li>
+<p>
+<a href="#S_Configure"><em>Configurer l&#8217;ordinateur de plongée</em></a> - Modifier la
+  configuration d&#8217;un ordinateur de plongée.
+</p>
+</li>
+<li>
+<p>
+<em>Quitter</em> - Quitter <em>Subsurface</em>.
+</p>
+</li>
+</ul></div>
+</div>
+<div class="sect2">
+<h3 id="_importer">14.2. Importer</h3>
+<div class="ulist"><ul>
+<li>
+<p>
+<a href="#S_ImportDiveComputer"><em>Importer depuis un l&#8217;ordinateur de plongée</em></a> -
+  Importer des informations de plongées à partir de l&#8217;ordinateur de plongée.
+</p>
+</li>
+<li>
+<p>
+<a href="#Unified_import"><em>Importer des fichiers de log</em></a> - Importer des
+  informations de plongées à partir d&#8217;un fichier d&#8217;un format compatible avec
+  <em>Subsurface</em>.
+</p>
+</li>
+<li>
+<p>
+<a href="#S_Companion"><em>Importer les données GPS depis le service web Subsurface</em></a> -
+  Charge les coordonnées GPS à partir de l&#8217;application mobile <em>Subsurface</em>
+  (téléphones et tablettes).
+</p>
+</li>
+<li>
+<p>
+<a href="#S_ImportingDivelogsDe"><em>Importer depuis Divelogs.de</em></a> - Importer des
+  informations de plongées à partir de <em>www.Divelogs.de</em>.
+</p>
+</li>
+</ul></div>
+</div>
+<div class="sect2">
+<h3 id="_journal_log">14.3. Journal (log)</h3>
+<div class="ulist"><ul>
+<li>
+<p>
+<a href="#S_EnterData"><em>Ajouter une plongée</em></a> -  Ajouter manuellement une nouvelle
+  plongée au panneau de la <strong>liste des plongées</strong>.
+</p>
+</li>
+<li>
+<p>
+<em>Edit dive</em> - Edit a dive of which the profile was entered by hande and not
+  from a dive computer.
+</p>
+</li>
+<li>
+<p>
+<a href="#S_DivePlanner"><em>Planifier une plongée</em></a> - Cette fonctionnalité permet de
+  planifier des plongées.
+</p>
+</li>
+<li>
+<p>
+<a href="#S_Replan"><em>Modifier la plongée dans le planificateur</em></a> - Modifier une
+  plongée planifiée qui a été enregistrée dans la <strong>liste des plongées</strong>.
+</p>
+</li>
+<li>
+<p>
+<a href="#S_CopyComponents"><em>Copier les composants de la plongée</em></a> - En
+  sélectionnant cette option, vous pouvez copier les informations de plusieurs
+  champs d&#8217;un journal de plongée vers le presse-papier.
+</p>
+</li>
+<li>
+<p>
+<em>Coller les composants de la plongée</em>  - Colle, dans les plongées
+  sélectionnées dans la <strong>liste des plongées</strong>, les informations copiées au
+  préalable avec l&#8217;option <em>Copier les composants de la plongée</em>.
+</p>
+</li>
+<li>
+<p>
+<a href="#S_Renumber"><em>Renuméroter</em></a> - Renuméroter les plongées sélectionnées dans
+  le panneau de la <strong>liste des plongées</strong>.
+</p>
+</li>
+<li>
+<p>
+<a href="#S_Group"><em>Grouper automatiquement</em></a> - Grouper les plongées du panneau de
+  <strong>liste des plongées</strong> dans des voyages de plongées.
+</p>
+</li>
+<li>
+<p>
+<a href="#S_DeviceNames"><em>Editer les noms des ordinateurs de plongée</em></a> - Modifier
+  les noms des ordinateurs de plongée pour faciliter vos journaux (logs).
+</p>
+</li>
+<li>
+<p>
+<a href="#S_Filter"><em>Filtrer la liste des plongées</em></a> - Sélectionner seulement
+  certaines plongées, à partir de tags ou de critères de plongées.
+</p>
+</li>
+</ul></div>
+</div>
+<div class="sect2">
+<h3 id="_vue">14.4. Vue</h3>
+<div class="ulist"><ul>
+<li>
+<p>
+<a href="#S_ViewPanels"><em>Tout</em></a> - Affiche les quatre panneaux principaux de
+  <em>Subsurface</em> simultanément.
+</p>
+</li>
+<li>
+<p>
+<a href="#S_ViewPanels"><em>Liste des plongées</em></a> - Affiche uniquement le panneau de la
+  <strong>liste des plongées</strong>.
+</p>
+</li>
+<li>
+<p>
+<a href="#S_ViewPanels"><em>Profil</em></a> - Affiche uniquement le panneau du <strong>profil de la
+  plongée</strong>.
+</p>
+</li>
+<li>
+<p>
+<a href="#S_ViewPanels"><em>Info</em></a> - Affiche uniquement le panneau des <strong>notes</strong>.
+</p>
+</li>
+<li>
+<p>
+<a href="#S_ViewPanels"><em>Globe</em></a> - Affiche uniquement le panneau de la <strong>carte
+  mondiale</strong>.
+</p>
+</li>
+<li>
+<p>
+<em>Statistiques annuelles</em>  - Affiche par année le résumé des statistiques des
+  plongées effectuées.
+</p>
+</li>
+<li>
+<p>
+<em>Prev DC</em> - If a single dive was logged from more than one dive computer,
+  switch to data from
+   ordinateur de plongée précédent.
+</p>
+</li>
+<li>
+<p>
+<em>Ordinateur suivant</em>  - Passer à l&#8217;ordinateur de plongée suivant.
+</p>
+</li>
+<li>
+<p>
+<em>Plein écran</em>  - Passer en mode plein écran.
+</p>
+</li>
+</ul></div>
+</div>
+<div class="sect2">
+<h3 id="_share_on">14.5. Share on</h3>
+<div class="ulist"><ul>
+<li>
+<p>
+<a href="#S_Facebook"><em>Facebook</em></a> - Partager la plongée sélectionnée sur votre
+  Facebook.
+</p>
+</li>
+</ul></div>
+</div>
+<div class="sect2">
+<h3 id="_aide">14.6. Aide</h3>
+<div class="ulist"><ul>
+<li>
+<p>
+<em>À propos de Subsurface</em>  - Affiche un panneau avec le numéro de version de
+  <em>Subsurface</em> ainsi que les informations de licence.
+</p>
+</li>
+<li>
+<p>
+<em>Vérifier les mises à jour</em>  - Vérifier si une nouvelle version de
+  Subsurface est disponible sur le <a href="http://subsurface-divelog.org/">site web de
+  <em>Subsurface</em> </a>.
+</p>
+</li>
+<li>
+<p>
+<a href="#S_UserSurvey"><em>Sondge utilisateur</em></a> - Aider à rendre <em>Subsurface</em> encore
+  meilleur en répondant à notre sondage utilisateur ou en répondant à un autre
+  sondage, si vos habitudes de plongées ont changées.
+</p>
+</li>
+<li>
+<p>
+<em>Manuel utilisateur</em>  - Ouvre une fenêtre affichant ce manuel utilisateur.
+</p>
+</li>
+</ul></div>
+</div>
+</div>
+</div>
+<div class="sect1">
+<h2 id="_annexe_a_informations_spécifiques_au_système_d_8217_exploitation_utilisé_pour_importer_les_informations_de_plongées_depuis_un_ordinateur_de_plongée">15. ANNEXE A : informations spécifiques au système d&#8217;exploitation utilisé pour importer les informations de plongées depuis un ordinateur de plongée.</h2>
+<div class="sectionbody">
+<div class="sect2">
+<h3 id="_assurez_vous_que_les_pilotes_drivers_nécessaires_sont_installés">15.1. Assurez-vous que les pilotes (drivers) nécessaires sont installés</h3>
+<div class="admonitionblock">
+<table><tr>
+<td class="icon">
+<img src="images/icons/drivers.jpg" alt="Note" />
+</td>
+<td class="content">Le système d&#8217;exploitation de l&#8217;ordinateur nécessite les bons pilotes pour
+communiquer avec l&#8217;ordinateur de plongée de la façon utilisée par
+l&#8217;ordinateur de plongée (Bluetooth, USB, infra-rouge).</td>
+</tr></table>
+</div>
+<div class="ulist"><ul>
+<li>
+<p>
+Sous Linux, les utilisateurs doivent avoir le bon module noyau de chargé. La
+          plupart des distributions Linux le font automatiquement, de telle sorte que
+          l&#8217;utilisateur n&#8217;ait rien à faire de particulier. Cependant, certains
+          protocoles de communication nécessitent des pilotes additionnels, plus
+          particulièrement pour certaines technologies telles que l&#8217;infra-rouge.
+</p>
+</li>
+<li>
+<p>
+Sous Windows, le bon pilote devrait être téléchargé automatiquement la
+          première fois que l&#8217;utilisateur branche son ordinateur de plongée sur le
+          port USB de son ordinateur de bureau.
+</p>
+</li>
+</ul></div>
+<div class="paragraph"><p>Sous Mac, les utilisateurs peuvent parfois avoir besoin d&#8217;installer
+manuellement le bon pilote. Par exemple, pour le Mares Puck ou n&#8217;importe
+quel autre ordinateur de plongée utilisant une interface USB-série basé sur
+le composant Silicon Labs CP2101 ou similaire, le bon pilote est disponible
+sous <em>Mac_OSX_VCP_Driver.zip</em> sur le
+<a href="http://www.silabs.com/support/pages/document-library.aspx?p=Interface&amp;f=USB%20Bridges&amp;pn=CP2101">dépôt
+de documents et logiciels Silicon Labs</a>.</p></div>
+</div>
+<div class="sect2">
+<h3 id="S_HowFindDeviceName">15.2. Comment trouver le nom du périphérique branché sur USB et paramétrer les permissions en écriture</h3>
+<div class="admonitionblock">
+<table><tr>
+<td class="icon">
+<img src="images/icons/usb.jpg" alt="Note" />
+</td>
+<td class="content">Lorsqu&#8217;un utilisateur connecte un ordinateur de plongée en utilisant l&#8217;USB,
+généralement <em>Subsurface</em> proposera soit une liste déroulante contenant le
+bon nom (ou le point de montage pour un Uemis Zurich) ou la liste sera
+désactivée si aucun nom de périphérique n&#8217;est nécessaire. Dans les rares cas
+où cela ne fonctionnerait pas, voici quelques suggestions pour trouver le
+nom de votre périphérique ;</td>
+</tr></table>
+</div>
+<div class="paragraph"><div class="title">Sur Windows :</div><p>Essayez simplement COM1, COM2, etc. La liste déroulante devrait contenir
+tous les périphériques COM connectés.</p></div>
+<div class="paragraph"><div class="title">Sur MacOS :</div><p>La liste déroulante devrait contenir tous les ordinateurs de plongée
+connectés.</p></div>
+<div class="paragraph"><div class="title">Sur Linux :</div><p>Il existe un moyen sûr de trouver le port :</p></div>
+<div class="ulist"><ul>
+<li>
+<p>
+Déconnecter le cable USB de l&#8217;ordinateur de plongée
+</p>
+</li>
+<li>
+<p>
+Ouvrir un terminal
+</p>
+</li>
+<li>
+<p>
+Taper la commande <em>dmesg</em> et appuyer sur la touche Entrer
+</p>
+</li>
+<li>
+<p>
+Connecter le cable USB de l&#8217;ordinateur de plongée
+</p>
+</li>
+<li>
+<p>
+Taper la commande <em>dmesg</em> et appuyer sur la touche Entrer
+</p>
+</li>
+</ul></div>
+<div class="paragraph"><p>Un message similaire à celui-ci devrait apparaitre :</p></div>
+<div class="literalblock">
+<div class="content">
+<pre><code>usb 2-1.1: new full speed USB device number 14 using ehci_hcd
+usbcore: registered new interface driver usbserial
+USB Serial support registered for generic
+usbcore: registered new interface driver usbserial_generic
+usbserial: USB Serial Driver core
+USB Serial support registered for FTDI USB Serial Device
+ftdi_sio 2-1.1:1.0: FTDI USB Serial Device converter detected
+usb 2-1.1: Detected FT232BM
+usb 2-1.1: Number of endpoints 2
+usb 2-1.1: Endpoint 1 MaxPacketSize 64
+usb 2-1.1: Endpoint 2 MaxPacketSize 64
+usb 2-1.1: Setting MaxPacketSize 64
+usb 2-1.1: FTDI USB Serial Device converter now attached to ttyUSB3
+usbcore: registered new interface driver ftdi_sio
+ftdi_sio: v1.6.0:USB FTDI Serial Converters Driver</code></pre>
+</div></div>
+<div class="paragraph"><p>La troisième ligne en partant du bas montre que l&#8217;adaptateur FTDI USB est
+détecté et connecté sur <code>ttyUSB3</code>. Cette information peut à présent être
+utilisée pour les paramètres d&#8217;importation en tant que <code>/dev/ttyUSB3</code> pour
+que Subsurface utilise le bon port USB.</p></div>
+<div class="paragraph"><p>S&#8217;assurer que l&#8217;utilisateur possède les droits d'écriture sur le port série
+USB :</p></div>
+<div class="paragraph"><p>Sur les systèmes similaires à Unix, les ports USB ne peuvent être accédés
+que par des utilisateurs membres du groupe <code>dialout</code>. Si vous n'êtes pas
+root, vous n'êtes peut-être pas membre de ce groupe et ne pouvez donc pas
+utiliser le port USB. Si votre nom d&#8217;utilisateur est <em>johnB</em> :</p></div>
+<div class="paragraph"><p>En tant que root, tapez : usermod -a -G dialout johnB+ (utilisateurs
+d&#8217;Ubuntu : <code>sudo usermod -a -G dialout johnB</code>)  Cela ajoute johnB au groupe
+<code>dialout</code>.
+Tapez : <code>id johnB</code>     Cela liste tous les groupes auquel johnB appartient et
+vérifiez que
+l&#8217;appartenance au groupe est bien effectif. Le groupe <code>dialout</code> devrait
+être listé
+parmi les différents IDs.
+Sous certaines circonstances, les modifications ne prennent effet qu&#8217;après une déconnexionpuis reconnexion sur l&#8217;ordinateur (sous Ubuntu, par exemple).
+Avec le bon nom de périphérique (par exemple <code>dev/ttyUSB3</code>) et avec un accès
+en écriture au port USB, l&#8217;ordinateur de plongée devrait se connecter et
+vous devriez pouvoir importer vos plongées.</p></div>
+</div>
+<div class="sect2">
+<h3 id="S_HowFindBluetoothDeviceName">15.3. Manually setting up Bluetooth enabled devices</h3>
+<div class="admonitionblock">
+<table><tr>
+<td class="icon">
+<img src="images/icons/bluetooth.jpg" alt="Note" />
+</td>
+<td class="content">For dive computers communicating through Bluetooth like the Heinrichs
+Weikamp Frog or the Shearwater Predator and Petrel there is a different
+procedure to get the devices name to communicate with <em>Subsurface</em>. Follow
+these steps:</td>
+</tr></table>
+</div>
+<div class="ulist"><ul>
+<li>
+<p>
+<strong>For the dive computer, after enabling Bluetooth, ensure it is in Upload mode.</strong>
+</p>
+</li>
+</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>
+<div class="ulist"><ul>
+<li>
+<p>
+<strong>Pair the <em>Subsurface</em> computer with the dive computer.</strong>
+</p>
+</li>
+</ul></div>
+<div class="sect3">
+<h4 id="_sur_windows_2">15.3.1. Sur Windows :</h4>
+<div class="paragraph"><p>Bluetooth is most likely already enabled. For pairing with the dive computer
+choose <em>Control Panel &#8594; Bluetooth Devices &#8594; Add Wireless Device</em>.  This
+should bring up a dialog showing your dive computer (which should be in
+Bluetooth mode) and allowing pairing. Right click on it and choose
+<em>Properties&#8594; COM Ports</em> to identify the port used for your dive
+computer. If there are several ports listed, use the one saying "Outgoing"
+instead of "Incoming".</p></div>
+<div class="paragraph"><p>For downloading to <em>Subsurface</em>, the <em>Subsurface</em> drop-down list should
+contain this COM port already. If not, enter it manually.</p></div>
+<div class="paragraph"><p>Note: If there are issues afterwards when downloading from the dive computer
+using other software, remove the existing pairing with the dive computer.</p></div>
+</div>
+<div class="sect3">
+<h4 id="_sur_macos">15.3.2. Sur MacOS :</h4>
+<div class="paragraph"><p>Click on the Bluetooth symbol in the menu bar and select <em>Set up Bluetooth
+Device&#8230;</em>. The dive computer should then show up in the list of
+devices. Select it and go through the pairing process. This step should only
+be needed once for initial setup.</p></div>
+<div class="paragraph"><p>Once the pairing is completed the correct device is shown in the <em>Device or
+Mount Point</em> drop-down in the <em>Subsurface</em> <strong>Import</strong> dialog.</p></div>
+</div>
+<div class="sect3">
+<h4 id="_sur_linux">15.3.3. Sur Linux</h4>
+<div class="paragraph"><p>Ensure Bluetooth is enabled on the <em>Subsurface</em> computer.  On most common
+distributions this should be true out of the box and pairing should be
+straight forward. For instance, Gnome3 shows a Bluetooth icon on the right
+of the toolbar at the top of the screen.  Users have reported difficulties
+with some Bluetooth controllers.  If you have an onboard controller, try
+that first.  It is simplest if you remove any USB Bluetooth dongles.  If you
+have a USB dongle that came with your dive computer, try that before any
+others.</p></div>
+<div class="paragraph"><p>Setting up a connection to download dives from your Bluetooth-enabled
+device, such as the <em>Shearwater Petrel</em>, is not yet an automated process and
+will generally require the command prompt.  It is essentially a three step
+process.</p></div>
+<div class="ulist"><ul>
+<li>
+<p>
+Enable the Bluetooth controller and pair your dive computer
+</p>
+</li>
+<li>
+<p>
+Establish an RFCOMM connection
+</p>
+</li>
+<li>
+<p>
+Download the dives with Subsurface
+</p>
+</li>
+</ul></div>
+<div class="paragraph"><p>Ensure the dive computer is in upload mode. On the <em>Shearwater Petrel</em> and
+<em>Petrel 2</em>, cycle through the menu, select <em>Dive Log</em>, then <em>Upload Log</em>.
+The display will read <em>Initializing</em>, then <em>Wait PC 3:00</em> and will
+countdown.  Once the connection is established, the display reads <em>Wait CMD
+&#8230;</em> and the countdown continues. When downloading the dive from Subsurface,
+the display reads <em>Sending</em> then <em>Sent Dive</em>.</p></div>
+<div class="paragraph"><p>To establish the connection, establish root access through <code>sudo</code> or <code>su</code>.
+The correct permission is required to download the dives in the computer. On
+most Linux systems this means becoming a member of the dialout group (This
+is identical as for many dive computers using a Linux USB port, described in
+the previous section). On the command terminal, enter:</p></div>
+<div class="paragraph"><p><code>sudo usermod -a -G dialout username</code></p></div>
+<div class="paragraph"><p>Then log out and log in for the change to take effect.</p></div>
+<div class="sect4">
+<h5 id="_enabling_the_bluetooth_controller_and_pairing_your_dive_computer">Enabling the Bluetooth controller and pairing your dive computer</h5>
+<div class="paragraph"><p>Attempt to set up the Bluetooth controller and pair your dive computer using
+the graphical environment of the operating system. After setting the dive
+computer to upload mode, click the Bluetooth icon in the system tray and
+select <em>Add new device</em>. The dive computer should appear. If asked for a
+password, enter 0000.  Write down or copy the MAC address of your dive
+computer - this needed later and should be in the form  00:11:22:33:44:55.</p></div>
+<div class="paragraph"><p>If the graphical method didn&#8217;t work, pair the device from the command
+line. Open a terminal and use <code>hciconfig</code> to check the Bluetooth controller
+status</p></div>
+<div class="literalblock">
+<div class="content">
+<pre><code>$ hciconfig
+hci0:   Type: BR/EDR  Bus: USB
+        BD Address: 01:23:45:67:89:AB  ACL MTU: 310:10  SCO MTU: 64:8
+        *DOWN*
+        RX bytes:504 acl:0 sco:0 events:22 errors:0
+        TX bytes:92 acl:0 sco:0 commands:21 errors:0</code></pre>
+</div></div>
+<div class="paragraph"><p>This indicates a Bluetooth controller with MAC address 01:23:45:67:89:AB,
+connected as hci0.  Its status is <em>DOWN</em>, i.e. not powered.  Additional
+controllers will appear as hci1, etc.  If there is not a Bluetooth dongle
+plugged in upon booting the computer, hci0 is probably the onboard.  Now
+power on the controller and enable authentication:</p></div>
+<div class="literalblock">
+<div class="content">
+<pre><code>sudo hciconfig hci0 up auth+  (enter password when prompted)
+hciconfig
+hci0:  Type: BR/EDR  Bus: USB
+        BD Address: 01:23:45:67:89:AB  ACL MTU: 310:10  SCO MTU: 64:8
+        *UP RUNNING PSCAN AUTH*
+        RX bytes:1026 acl:0 sco:0 events:47 errors:0
+        TX bytes:449 acl:0 sco:0 commands:46 errors:0</code></pre>
+</div></div>
+<div class="paragraph"><p>Check that the status now includes <code><em>UP</em>, <em>RUNNING</em> AND <em>AUTH</em></code>.</p></div>
+<div class="paragraph"><p>If there are multiple controllers running, it&#8217;s easiest to off the unused
+controller(s). For example, for <code>hci1</code>:</p></div>
+<div class="literalblock">
+<div class="content">
+<pre><code>sudo hciconfig hci1 down</code></pre>
+</div></div>
+<div class="paragraph"><p>Next step is to <em>trust</em> and <em>pair</em> the dive computer. On distros with Bluez
+5, such as Fedora 22, one can use a tool called <code>blutootctl</code>, which will
+bring up its own command prompt.</p></div>
+<div class="literalblock">
+<div class="content">
+<pre><code>bluetoothctl
+[NEW] Controller 01:23:45:67:89:AB localhost.localdomain [default]
+[bluetooth]# agent on
+Agent registered
+[bluetooth]# default-agent
+Default agent request successful
+[bluetooth]# scan on                        &lt;----now set your dive computer to upload mode
+Discovery started
+[CHG] Controller 01:23:45:67:89:AB Discovering: yes
+[NEW] Device 00:11:22:33:44:55 Petrel
+[bluetooth]# trust 00:11:22:33:44:55        &lt;----you can use the tab key to autocomplete the MAC address
+[CHG] Device 00:11:22:33:44:55 Trusted: yes
+Changing 00:11:22:33:44:55 trust succeeded
+[bluetooth]# pair 00:11:22:33:44:55
+Attempting to pair with 00:11:22:33:44:55
+[CHG] Device 00:11:22:33:44:55 Connected: yes
+[CHG] Device 00:11:22:33:44:55 UUIDs: 00001101-0000-1000-8000-0089abc12345
+[CHG] Device 00:11:22:33:44:55 Paired: yes
+Pairing successful
+[CHG] Device 00:11:22:33:44:55 Connected: no</code></pre>
+</div></div>
+<div class="paragraph"><p>If asked for a password, enter 0000. It&#8217;s ok if the last line says
+<em>Connected: no</em>. The important part is the line above, <code>Pairing successful</code>.</p></div>
+<div class="paragraph"><p>If the system has Bluez version 4 (e.g. Ubuntu 12.04 through to 15.04),
+there is probably not a <code>bluetoothctl</code>, but a script called
+<code>bluez-simple-agent</code> or just <code>simple-agent</code>.</p></div>
+<div class="literalblock">
+<div class="content">
+<pre><code>hcitool -i hci0 scanning
+Scanning ...
+        00:11:22:33:44:55       Petrel
+        bluez-simple-agent hci0 00:11:22:33:44:55</code></pre>
+</div></div>
+<div class="paragraph"><p>Once ther dive computer is pired, set up the RFCOMM connection</p></div>
+</div>
+<div class="sect4">
+<h5 id="_establishing_the_rfcomm_connection">Establishing the RFCOMM connection</h5>
+<div class="paragraph"><p>The command to establish an RFCOMM connection is:</p></div>
+<div class="paragraph"><p><code>sudo rfcomm -i &lt;controller&gt; connect &lt;dev&gt; &lt;bdaddr&gt; [channel]</code></p></div>
+<div class="ulist"><ul>
+<li>
+<p>
+<code>&lt;controller&gt;</code> is the Bluetooth controller, <code>hci0</code>.
+</p>
+</li>
+<li>
+<p>
+<code>&lt;dev&gt;</code> is the RFCOMM device file, <code>rfcomm0</code>
+</p>
+</li>
+<li>
+<p>
+<code>&lt;bdaddr&gt;</code> is the dive computer&#8217;s MAC address, <code>00:11:22:33:44:55</code>
+</p>
+</li>
+<li>
+<p>
+<code>[channel]</code> is the dive computer&#8217;s Bluetooth channel we need to connect to.
+</p>
+</li>
+</ul></div>
+<div class="paragraph"><p>If one omits it, channel 1 is assumed.  Based on a limited number of user
+reports, the appropriate channel for the dive computer is probably:</p></div>
+<div class="ulist"><ul>
+<li>
+<p>
+<em>Shearwater Petrel 2</em>: channel 5
+</p>
+</li>
+<li>
+<p>
+<em>Shearwater Petrel 1</em>: channel 1
+</p>
+</li>
+<li>
+<p>
+<em>Heinrichs-Weikamp OSTC Sport</em>: channel 1
+</p>
+</li>
+</ul></div>
+<div class="paragraph"><p>E.g. to connect a <em>Shearwater Petrel 2</em>, set the dive computer to upload
+mode and enter:</p></div>
+<div class="literalblock">
+<div class="content">
+<pre><code>sudo rfcomm -i hci0 connect rfcomm0 00:11:22:33:44:55 5 (enter a password, probably 0000, when prompted)</code></pre>
+</div></div>
+<div class="paragraph"><p>This gives the response:</p></div>
+<div class="literalblock">
+<div class="content">
+<pre><code>Connected /dev/rfcomm0 to 00:11:22:33:44:55 on channel 5
+Press CTRL-C for hangup</code></pre>
+</div></div>
+<div class="paragraph"><p>To connect a _Shearwater Petrel 1+ or + HW OSTC Sport+, set the dive
+computer to upload mode and enter:</p></div>
+<div class="literalblock">
+<div class="content">
+<pre><code>sudo rfcomm -i hci0 connect rfcomm0 00:11:22:33:44:55   (enter a password, probably 0000, when prompted)
+Connected /dev/rfcomm0 to 00:11:22:33:44:55 on channel 1
+Press CTRL-C for hangup</code></pre>
+</div></div>
+<div class="paragraph"><p>If the specific channel the dive computer needs is not known, or the channel
+in the list above doesn&#8217;t work, the command <code>sdptool records</code> should help
+determine the appropriate channel. The output below is for a <em>Shearwater
+Petrel 2</em>.</p></div>
+<div class="literalblock">
+<div class="content">
+<pre><code>sdptool -i hci0 records 00:11:22:33:44:55
+Service Name: Serial Port
+Service RecHandle: 0x10000
+Service Class ID List:
+        "Serial Port" (0x1101)
+        Protocol Descriptor List:
+        "L2CAP" (0x0100)
+        "RFCOMM" (0x0003)
+        Channel: 5</code></pre>
+</div></div>
+<div class="paragraph"><p>For a Bluetooth dive computer not in the list above, or if the channel
+listed is not correct, please let the Subsurface developers know on the user
+forum or the developer mailing list <em>subsurface@subsurface-divelog.org</em>.</p></div>
+</div>
+<div class="sect4">
+<h5 id="_download_the_dives_with_subsurface">Download the dives with Subsurface</h5>
+<div class="paragraph"><p>After establishing the RFCOMM connection and while the dive computer&#8217;s
+upload mode countdown is still running, go to_Subsurface_, select
+<em>Import&#8594;Import from dive computer</em> and enter appropriate Vendor
+(e.g. <em>Shearwater</em>), Dive Computer (<em>Petrel</em>), Device or Mount Point
+(<em>/dev/rfcomm0</em>) and click <em>Download</em>.</p></div>
+</div>
+</div>
+</div>
+</div>
+</div>
+<div class="sect1">
+<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">16.1. Importing from Uemis Zurich</h3>
+<div class="admonitionblock">
+<table><tr>
+<td class="icon">
+<img src="images/icons/iumis.jpg" alt="Note" />
+</td>
+<td class="content"><em>Subsurface</em> downloads the information stored on the SDA (the built-in file
+system of the Uemis) including information about dive spots and
+equipment. Buddy information is not yet downloadable.  Things are very
+similar to a normal USB-connected dive computer (the Uemis is one of those
+that recharge when connected to the USB port).  The main difference is that
+one does not enter a device name, but instead the location where the
+UEMISSDA file system is mounted once connected to the dive computer. On
+Windows this is a drive letter ( often <em>E:</em> or <em>F:</em>), on a Mac this is
+<em>/Volumes/UEMISSDA</em> and on Linux systems this differs depending on the
+distribution. On Fedora it usually is
+<em>/var/run/media/&lt;your_username&gt;/UEMISSDA</em>. In all cases <em>Subsurface</em> should
+suggest the correct location in the drop down list.</td>
+</tr></table>
+</div>
+<div class="paragraph"><p>After selecting the above device name, download the dives from the Uemis
+Zurich. One technical issue with the Uemis Zurich download implementation
+(this is a Uemis firmware limitation, not a <em>Subsurface</em> issue) is that one
+cannot download more than about 40-50 dives without running out of memory on
+the SDA. This will usually only happen the very first time one downloads
+dives from the Uemis Zurich.  Normally when downloading at the end of a day
+or even after a dive trip, the capacity is sufficient. If <em>Subsurface</em>
+displays an error that the dive computer ran out of space the solution is
+straight forward.  Disconnect the SDA, turn it off and on again, and
+reconnect it. You can now retry (or start a new download session) and the
+download will continue where it stopped previously. One 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">16.2. Importing from Uwatec Galileo</h3>
+<div class="admonitionblock">
+<table><tr>
+<td class="icon">
+<img src="images/icons/Galileo.jpg" alt="Note" />
+</td>
+<td class="content">The Uwatec Galileo dive computers use infra red (IrDA) communication between
+the dive computer and Subsurface. The Uwatec hardware uses a USB dongle
+based on the serial infra-red (SIR) protocol and the MSC7780 IrDA controller
+manufactured by MosChip and marketed by Scubapro and some electronics
+companies.  Under Linux, the kernel already provides for communication using
+the IrDA protocol. However, the user additionally needs to load a driver for
+the IrDA interface with the dive computer. The easiest way is to load the
+<strong>irda-tools</strong> package from the
+<a href="http://irda.sourceforge.net/docs/startirda.html">Linux IrDA Project</a>.  After
+the installation of the irda-tools, the <strong>root user</strong> can specify a device
+name from the console as follows: <code>irattach irda0</code></td>
+</tr></table>
+</div>
+<div class="paragraph"><p>After executing this command, Subsurface will recognise the Galileo dive
+computer and download dive information.</p></div>
+<div class="paragraph"><p>Under Windows, a similar situation exists. Drivers for the MCS7780 are
+available from some Internet web sites e.g.
+<a href="http://www.drivers-download.com/Drv/MosChip/MCS7780/">www.drivers-download.com</a>.
+Windows-based IrDA drivers for the Uwatec can also be downloaded from the
+ScubaPro web site, drivers being located on the download page for the
+ScubaPro SmartTrak software.</p></div>
+<div class="paragraph"><p>For the Apple Mac, IrDA communication via the MCS7780 link is not available
+for OSX 10.6 or higher.</p></div>
+</div>
+<div class="sect2">
+<h3 id="S_ImportingDR5">16.3. Importing from Heinrichs Weikamp DR5</h3>
+<div class="admonitionblock">
+<table><tr>
+<td class="icon">
+<img src="images/icons/HW_DR5.jpg" alt="Note" />
+</td>
+<td class="content">When mounted as a USB drive the Heinrichs Weikamp DR5 saves a single UDDF
+file for every dive.  Mark all the dives you&#8217;d like to import or open.
+Note: The DR5 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 DR5.</td>
+</tr></table>
+</div>
+</div>
+<div class="sect2">
+<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_petrel_using_bluetooth">16.5. Importing from Shearwater Predator/Petrel using Bluetooth</h3>
+<div class="admonitionblock">
+<table><tr>
+<td class="icon">
+<img src="images/icons/predator.jpg" alt="Note" />
+</td>
+<td class="content">Specific instructions for downloading dives using Bluetooth are given in the
+section above, <a href="#S_Bluetooth"><em>Connecting Subsurface to a Bluetooth-enabled dive computer</em></a>.</td>
+</tr></table>
+</div>
+</div>
+<div class="sect2">
+<h3 id="S_PoseidonMkVI">16.6. Importing from Poseidon MkVI Discovery</h3>
+<div class="admonitionblock">
+<table><tr>
+<td class="icon">
+<img src="images/MkVI.jpeg" alt="Note" />
+</td>
+<td class="content">Download of dive logs from the MkVI is performed using a custom
+communications adapter and the <em>Poseidon PC Configuration Software</em>,
+obtained when purchasing the MKVI equipment. The latter is a Windows
+application allowing configuration of equipment and storage of dive
+logs. Communication between dive computer and desktop computer utilises the
+IrDA infra-red protocol. Only data for one dive can be downloaded at a time,
+comprising three files:</td>
+</tr></table>
+</div>
+<div class="ulist"><ul>
+<li>
+<p>
+Setup configuration for the dive and key dive parameters (file with a .txt
+  extension)
+</p>
+</li>
+<li>
+<p>
+Dive log details (file with a .csv extension)
+</p>
+</li>
+<li>
+<p>
+Redbook format dive log (file with .cvsr extension). This is a compressed
+  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_from_apd_inspiration_evolution_ccr">16.7. Importing from APD Inspiration/Evolution CCR</h3>
+<div class="admonitionblock">
+<table><tr>
+<td class="icon">
+<img src="images/APDComputer.jpg" alt="Note" />
+</td>
+<td class="content">The dive logs of an APD Inspiration or similar CCR dive computer are
+downloaded using a communications adapter and <em>AP Communicator</em>, obtained
+when purchasing the equipment. The dive logs can be viewed using the <em>AP Log
+Viewer</em>, within Windows or Mac/OS. However, APD logs can be viewed and
+managed from within <em>Subsurface</em> (together with dives using many other types
+of dive computer). The APD inspiration dive logs are imported into
+<em>Subsurface</em> as follows:</td>
+</tr></table>
+</div>
+<div class="ulist"><ul>
+<li>
+<p>
+Download the dive using <em>AP Communicator</em>.
+</p>
+</li>
+<li>
+<p>
+Open a dive within the <em>AP Log Viewer</em>.
+</p>
+</li>
+<li>
+<p>
+Select the tab at the top of the screen, entitled "<em>Data</em>".
+</p>
+</li>
+<li>
+<p>
+With the raw dive log data show on the screen, click on "<em>Copy to
+  Clipboard</em>".
+</p>
+</li>
+<li>
+<p>
+Open a text editor, e.g. Notepad (Windows) or TextWrangler (Mac).
+</p>
+</li>
+<li>
+<p>
+Copy the contents of the clipboard into the text editor and save the text
+  file with a filename extension of <em>.apd</em>
+</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>.
+</p>
+</li>
+<li>
+<p>
+In the dropdown list towards the bottom right of the dialogue (labled
+  <em>Filter:</em>), select "APD log viewer".
+</p>
+</li>
+<li>
+<p>
+On the list of file names select the <em>.apd</em> file that has been created
+  above. An import dialogue opens indicating the default settings for the data
+  in the <em>.apd</em> file. If any changes are required, do this as for
+  <a href="#S_ImportingCSVDives">CSV imports</a>.
+</p>
+</li>
+</ul></div>
+<div class="imageblock" style="text-align:center;">
+<div class="content">
+<img src="images/APD_CSVimportF22.jpg" alt="Figure: APD log viewer import" />
+</div>
+</div>
+<div class="ulist"><ul>
+<li>
+<p>
+The top left hand dropdown box in the import panel allows one to select the
+  APD dive computer for which the dive log needs to be imported. The default
+  it is DC1, <em>i.e.</em> the first of the two dive computers the APD uses. It is
+  possible to sequentially import the data for both dive computers by first
+  importing CD1 and then DC2.(<strong>Hint</strong>: The logs for the two dive computers are
+  viewed by selecting <em>View &#8594; Next DC</em> from the Main Menu after the uploading
+  has been completed)
+</p>
+</li>
+<li>
+<p>
+Click the <em>Ok</em> button at the bottom of the import panel.
+</p>
+</li>
+</ul></div>
+<div class="paragraph"><p>The APD dive log will appear within <em>Subsurface</em>. The dive
+computer-generated ceiling generated by the Inspiration can be viewed by
+selecting the appropriate button on the left of the <strong>Dive Profile</strong>. Cylinder
+pressure data are not logged by the APD equipment but can be manually
+entered in the <em>Equipment</em> Tab.</p></div>
+</div>
+</div>
+</div>
+<div class="sect1">
+<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 the dialogue found by selecting <em>Import</em> from the Main Menu,
+then clicking on <em>Import Log Files</em>. This is a single-step process, more
+information about which can be found <a href="#Unified_import">here.</a> However, in
+some cases, a two-step process may be required:</p></div>
+<div class="olist arabic"><ol class="arabic">
+<li>
+<p>
+Export the foreign dive log data to format that is accessible from
+  <em>Subsurface</em>.
+</p>
+</li>
+<li>
+<p>
+Import the accessible dive log data into <em>Subsurface</em>.
+</p>
+</li>
+</ol></div>
+<div class="paragraph"><p>This appendix provides some information about approaches to export dive log
+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">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 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>
+<div class="paragraph"><p><strong>Divemanager 3 (DM3):</strong></p></div>
+<div class="olist arabic"><ol class="arabic">
+<li>
+<p>
+Start <em>Suunto Divemanager 3</em> and log in with the name containing the logs
+</p>
+</li>
+<li>
+<p>
+Do not start the import wizard to import dives from the dive computer.
+</p>
+</li>
+<li>
+<p>
+In the navigation tree on the left side of the program-window, select the
+   appropriate dives.
+</p>
+</li>
+<li>
+<p>
+Within the list of dives, select the dives you would like to import later:
+</p>
+<div class="ulist"><ul>
+<li>
+<p>
+To select certain dives: hold <em>ctrl</em> and click the dive
+</p>
+</li>
+<li>
+<p>
+To select all dives: Select the first dive, hold down shift and select the
+          last dive
+</p>
+</li>
+</ul></div>
+</li>
+<li>
+<p>
+With the dives marked, use the program menu <em>File &#8594; Export</em>
+</p>
+</li>
+<li>
+<p>
+The export pop-up will show. Within this pop-up, there is one field called
+   <em>Export Path</em>.
+</p>
+<div class="ulist"><ul>
+<li>
+<p>
+Click the browse button next to the field Export Path
+</p>
+<div class="ulist"><ul>
+<li>
+<p>
+A file-manager like window pops up
+</p>
+</li>
+<li>
+<p>
+Navigate to the directory for storing the
+   Divelog.SDE file
+</p>
+</li>
+<li>
+<p>
+Optionally change the name of the file for saving
+</p>
+</li>
+<li>
+<p>
+Click <em>Save</em>
+</p>
+</li>
+</ul></div>
+</li>
+<li>
+<p>
+Back in the Export pop-up, press the button <em>Export</em>
+</p>
+</li>
+</ul></div>
+</li>
+<li>
+<p>
+The dives are now exported to the file Divelog.SDE.
+</p>
+</li>
+</ol></div>
+<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 (or DM5) database:</p></div>
+<div class="olist arabic"><ol class="arabic">
+<li>
+<p>
+Start Suunto DM4/DM5
+</p>
+</li>
+<li>
+<p>
+Select <em>Help &#8594; About</em>
+</p>
+</li>
+<li>
+<p>
+Click <em>Copy</em> after text <em>Copy log folder path to clipboard</em>
+</p>
+</li>
+<li>
+<p>
+Now open Windows Explorer
+</p>
+</li>
+<li>
+<p>
+Paste the address to the path box at the top of the File Explorer
+</p>
+</li>
+<li>
+<p>
+The database is called DM4.db or DM5.db
+</p>
+</li>
+</ol></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/DM5
+</p>
+</li>
+<li>
+<p>
+Select <em>File - Create backup</em>
+</p>
+</li>
+<li>
+<p>
+From the file menu select the location and name for the backup, we&#8217;ll use
+   DM4 (or DM5) in here with the default extension .bak
+</p>
+</li>
+<li>
+<p>
+Click <em>Save</em>
+</p>
+</li>
+<li>
+<p>
+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_atomic_logbook">17.2. Exporting from Atomic Logbook</h3>
+<div class="admonitionblock" id="Atomic_Export">
+<table><tr>
+<td class="icon">
+<img src="images/icons/atomiclogo.jpg" alt="Note" />
+</td>
+<td class="content">Atomic Logbook is a Windows software by Atomic Aquatics. It allows
+downloading of dive information from Cobalt and Cobalt 2 dive computers.
+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">
+<img src="images/icons/mareslogo.jpg" alt="Note" />
+</td>
+<td class="content">Mares Dive Organiser is a Windows application. The dive log is kept as a
+Microsoft SQL Compact Edition database with a <em>.sdf</em> filename extension. The
+database includes all Dive Organiser-registered divers on the particular
+computer and all Mares dive computers used. The safest way to obtain a copy
+of the dive database is to export the information to another compatible
+format which can be imported into <em>Subsurface</em>.</td>
+</tr></table>
+</div>
+<div class="olist arabic"><ol class="arabic">
+<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.
+</p>
+</li>
+<li>
+<p>
+Rename the file to DiveOrganiserxxxxx.zip. Inside the zipped directory is a
+   file <em>DiveOrganiser.sdf</em>.
+</p>
+</li>
+<li>
+<p>
+Extract the <em>.sdf</em> file from the zipped folder to your Desktop.
+</p>
+</li>
+<li>
+<p>
+The password for accessing the .zip file is <em>mares</em>.
+</p>
+</li>
+</ol></div>
+</div>
+<div class="sect2">
+<h3 id="S_ImportingDivingLog">17.4. Exporting from <strong>DivingLog 5.0 and 6.0</strong></h3>
+<div class="admonitionblock">
+<table><tr>
+<td class="icon">
+<img src="images/icons/divingloglogo.jpg" alt="Note" />
+</td>
+<td class="content">The best way to bring your logs from DivingLog to Subsurface is to convert
+the whole database. This is because other export formats do not include all
+the details, and we would lack e.g. gas switches and information of what
+units are used. With database import, all this information is included and
+readily available for us.</td>
+</tr></table>
+</div>
+<div class="paragraph"><p>To transfer all files from DivingLog to Subsurface, do the following:</p></div>
+<div class="olist arabic"><ol class="arabic">
+<li>
+<p>
+In DivingLog open the <em>File &#8594; Export &#8594; SQLite</em> menu
+</p>
+</li>
+<li>
+<p>
+Select <em>Settings</em> button
+</p>
+</li>
+<li>
+<p>
+Set the <em>RTF2Plaintext</em> to <em>true</em>
+</p>
+</li>
+<li>
+<p>
+Close the Settings dialog
+</p>
+</li>
+<li>
+<p>
+Click <em>Export</em> button and select the filename
+</p>
+</li>
+</ol></div>
+<div class="paragraph"><p>Once this is done, open the saved database file with Subsurface and the
+dives are automatically converted to our own format. Last step to do is save
+the log file in Subsurface.</p></div>
+</div>
+</div>
+</div>
+<div class="sect1">
+<h2 id="_annexe_d_exporter_un_tableur_vers_le_format_csv">18. ANNEXE D : Exporter un tableur vers le format CSV</h2>
+<div class="sectionbody">
+<div class="paragraph" id="S_Appendix_D"><p>De nombreux plongeurs conservent un carnet de plongée sous forme de fichier
+numérique, souvent un tableur avec différents champs et informations. Ces
+données peuvent facilement être importées dans <em>Subsurface</em> après que le
+tableur a été converti en fichier CSV. Cette section explique la procedure
+pour convertir un carnet de plongée enregistrée sous forme de tableur vers
+un fichier CSV qui pourra ensuite être importé dans <em>Subsurface</em>. Créer un
+fichier CSV est une tache simple malgré que la procédure soit différente
+selon le tableur utilisé.</p></div>
+<div class="paragraph"><p>La première étape est d&#8217;organiser les données de plongées dans le tableur
+pour que la première ligne contienne le nom (ou le titre) de chaque colonne
+et que les informations de chaque plongée soient contenues sur une seule
+ligne. <em>Subsurface</em> supporte de nombreux éléments (Dive #, Date, Time,
+Duration, Location, GPS, Max Depth, Mean Depth, Buddy, Notes, Weight et
+Tags). L&#8217;utilisateur peut organiser les données de plongées selon quelques
+règles simples :</p></div>
+<div class="olist arabic"><ol class="arabic">
+<li>
+<p>
+Date : utiliser un des formats suivants : aaaa-mm-jj, jj.mm.aaaa, mm/jj/aaaa
+</p>
+</li>
+<li>
+<p>
+Durée : le format est minutes:secondes.
+</p>
+</li>
+<li>
+<p>
+Système d&#8217;unité : un seul système d&#8217;unité doit être utilisé (pas de mélange
+   entre les unités impériales et métriques)
+</p>
+</li>
+<li>
+<p>
+Étiquettes et équipiers : les valeurs doivent être séparées par des
+   virgules.
+</p>
+</li>
+<li>
+<p>
+Position GPS : vous devez utiliser les degrés décimaux, par exemple :
+   30.22496 30.821798
+</p>
+</li>
+</ol></div>
+<div class="sect2">
+<h3 id="_em_libreoffice_calc_em_et_em_openoffice_calc_em">18.1. <em>LibreOffice Calc</em> et <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: <strong> In Windows 7, click the <em>Formats</em> tab, and then
+  click <em>Customize this format</em>.  </strong> In Windows XP, click the <em>Regional
+  Options</em> tab, and then click <em>Customize</em>.
+</p>
+</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="S_APPENDIX_E">19. ANNEXE E : Créer un modèle d&#8217;impression personnalisé</h2>
+<div class="sectionbody">
+<div class="paragraph"><p><em>Subsurface</em> provides a mechanism to create or modify templates for printing
+dive logs in order to produce customised printouts of dive logs. Templates,
+written in HTML as well as a simple Grantlee instruction set, are rendered
+to the print device by <em>Subsurface</em>.</p></div>
+<div class="paragraph"><p>Templates are accessed using the print dialogue (see image <strong>B</strong> below).</p></div>
+<div class="imageblock" style="text-align:center;">
+<div class="content">
+<img src="images/Print1_f22.jpg" alt="FIGURE: Print dialogue" />
+</div>
+</div>
+<div class="paragraph"><p>The buttons under the <em>Template</em> dropdown box allows one to <em>Edit</em>,
+<em>Delete</em>, <em>Import</em> and to <em>Export</em> templates (see image <strong>A</strong> above). New or
+modified templates are stored as HTML files in the same directory as the
+dive log being processed. In order to create or modify a template, select
+one of the templates from the template dropdown list in the print dialogue
+(see image <strong>B</strong> above). Choose an existing template that resembles the final
+desired printout. Then select <em>Edit</em>.</p></div>
+<div class="paragraph"><p>The Edit Panel comprises three tabs:</p></div>
+<div class="imageblock" style="text-align:center;">
+<div class="content">
+<img src="images/Template1_f22.jpg" alt="FIGURE: template edit dialogue" />
+</div>
+</div>
+<div class="paragraph"><p>1) The <em>Style</em> tab (image <strong>A</strong> above) controls the font, line spacing and colour
+   template used for printing the dive log.  The style attributes are
+   editable. Choose one of the four colour palets used for colour printing.</p></div>
+<div class="paragraph"><p>2) The <em>Colors</em> tab (image <strong>B</strong> above) allows editing the colours used for
+   printing the dive log. The colours are highly customisable: the <em>Edit</em>
+   buttons in the <em>Colors</em> tab allows choosing abritrary colours for different
+   components of the dive log printout.</p></div>
+<div class="paragraph"><p>3) The <em>Template</em> tab of the Edit Panel (see image below) allows creating a
+   template using HTML as well as a few Grantlee programming
+   primitives. Grantlee provides the ability to create and format HTML code in
+   a highly simple but efficient way (see below). The HTML of the template can
+   be edited and saved. The saved template is stored in the same directory as
+   the dive being processed. By default, a <em>Custom</em> template is a skeleton with
+   no specific print instructions. The informastion being printed needs to be
+   specified and formatted in the by replacing the section marked with: "&lt;!--
+   Template must be filled -&#8594;". Writing HTML code with Grantlee instructions
+   allows unlimited freedom in determining what is printed an in which way it
+   should be rendered.</p></div>
+<div class="imageblock" style="text-align:center;">
+<div class="content">
+<img src="images/Template2_f22.jpg" alt="FIGURE:Template tab" />
+</div>
+</div>
+<div class="paragraph"><p>One can adapt any of the existing templates and save it to the dive log
+directory. The standard templates (e.g. One dive, Six dives, Table) can be
+modified in this way. After completing the edits, use the <em>Export</em> button in
+the print dialogue to save the new template using a new template name.</p></div>
+<div class="paragraph"><p>To write a custom template the following elements must exist so that the
+template will be correctly handled and rendered.</p></div>
+<div class="sect2">
+<h3 id="_main_dive_loop">19.1. Main dive loop</h3>
+<div class="paragraph"><p><em>Subsurface</em> exports a dive list called (<strong>dives</strong>) to the <em>Grantlee</em>
+backend. It is possible to iterate over the list as follows:</p></div>
+<div class="literalblock">
+<div class="title">template.html</div>
+<div class="content">
+<pre><code>        {% for dive in dives %}
+                &lt;h1&gt; {{ dive.number }} &lt;/h1&gt;
+        {% endfor %}</code></pre>
+</div></div>
+<div class="literalblock">
+<div class="title">output.html</div>
+<div class="content">
+<pre><code>        &lt;h1&gt; 1 &lt;/h1&gt;
+        &lt;h1&gt; 2 &lt;/h1&gt;
+        &lt;h1&gt; 3 &lt;/h1&gt;</code></pre>
+</div></div>
+<div class="paragraph"><p>Additional information about <em>Grantlee</em> can be found
+<a href="http://www.grantlee.org/apidox/for_themers.html">here</a></p></div>
+</div>
+<div class="sect2">
+<h3 id="_grantlee_exported_variables">19.2. Grantlee exported variables</h3>
+<div class="paragraph"><p>Only a subset of the dive data is exported:</p></div>
+<div class="tableblock">
+<table rules="all"
+width="100%"
+frame="border"
+cellspacing="0" cellpadding="4">
+<col width="50%" />
+<col width="50%" />
+<tbody>
+<tr>
+<td align="left" valign="top"><p class="table"><strong>Name</strong></p></td>
+<td align="left" valign="top"><p class="table"><strong>Description</strong></p></td>
+</tr>
+<tr>
+<td align="left" valign="top"><p class="table">number</p></td>
+<td align="left" valign="top"><p class="table">(<strong>int</strong>) dive number</p></td>
+</tr>
+<tr>
+<td align="left" valign="top"><p class="table">id</p></td>
+<td align="left" valign="top"><p class="table">(<strong>int</strong>) unique dive ID, should be used to fetch the dive profile</p></td>
+</tr>
+<tr>
+<td align="left" valign="top"><p class="table">date</p></td>
+<td align="left" valign="top"><p class="table">(<strong>string</strong>) data of the dive</p></td>
+</tr>
+<tr>
+<td align="left" valign="top"><p class="table">time</p></td>
+<td align="left" valign="top"><p class="table">(<strong>string</strong>) time of the dive</p></td>
+</tr>
+<tr>
+<td align="left" valign="top"><p class="table">location</p></td>
+<td align="left" valign="top"><p class="table">(<strong>string</strong>) location of the dive</p></td>
+</tr>
+<tr>
+<td align="left" valign="top"><p class="table">duration</p></td>
+<td align="left" valign="top"><p class="table">(<strong>string</strong>) duration of the dive</p></td>
+</tr>
+<tr>
+<td align="left" valign="top"><p class="table">depth</p></td>
+<td align="left" valign="top"><p class="table">(<strong>string</strong>) depth of the dive</p></td>
+</tr>
+<tr>
+<td align="left" valign="top"><p class="table">divemaster</p></td>
+<td align="left" valign="top"><p class="table">(<strong>string</strong>) divemaster data</p></td>
+</tr>
+<tr>
+<td align="left" valign="top"><p class="table">buddy</p></td>
+<td align="left" valign="top"><p class="table">(<strong>string</strong>) buddy data</p></td>
+</tr>
+<tr>
+<td align="left" valign="top"><p class="table">airTemp</p></td>
+<td align="left" valign="top"><p class="table">(<strong>string</strong>) air temperature of dive</p></td>
+</tr>
+<tr>
+<td align="left" valign="top"><p class="table">waterTemp</p></td>
+<td align="left" valign="top"><p class="table">(<strong>string</strong>) water temperature of dive</p></td>
+</tr>
+<tr>
+<td align="left" valign="top"><p class="table">notes</p></td>
+<td align="left" valign="top"><p class="table">(<strong>string</strong>) dive notes</p></td>
+</tr>
+<tr>
+<td align="left" valign="top"><p class="table">rating</p></td>
+<td align="left" valign="top"><p class="table">(<strong>int</strong>) dive rating ranges from 0 to 5</p></td>
+</tr>
+<tr>
+<td align="left" valign="top"><p class="table">sac</p></td>
+<td align="left" valign="top"><p class="table">(<strong>string</strong>) sac value</p></td>
+</tr>
+<tr>
+<td align="left" valign="top"><p class="table">tags</p></td>
+<td align="left" valign="top"><p class="table">(<strong>string</strong>) all dive tags concatenate together</p></td>
+</tr>
+<tr>
+<td align="left" valign="top"><p class="table">gas</p></td>
+<td align="left" valign="top"><p class="table">(<strong>string</strong>) used gas cylinder</p></td>
+</tr>
+</tbody>
+</table>
+</div>
+<div class="paragraph"><p><em>Subsurface</em> also exports <strong>template_options</strong> data. This data must be used as
+<em>CSS</em> values to provide a dynamically editable template. The exported data
+is shown in the following table:</p></div>
+<div class="tableblock">
+<table rules="all"
+width="100%"
+frame="border"
+cellspacing="0" cellpadding="4">
+<col width="50%" />
+<col width="50%" />
+<tbody>
+<tr>
+<td align="left" valign="top"><p class="table"><strong>Name</strong></p></td>
+<td align="left" valign="top"><p class="table"><strong>Description</strong></p></td>
+</tr>
+<tr>
+<td align="left" valign="top"><p class="table">font</p></td>
+<td align="left" valign="top"><p class="table">(<strong>string</strong>) font family</p></td>
+</tr>
+<tr>
+<td align="left" valign="top"><p class="table">borderwidth</p></td>
+<td align="left" valign="top"><p class="table">(<strong>int</strong>) border-width value dynamically calculated as 0.1% of the page width with minimum value of 1px</p></td>
+</tr>
+<tr>
+<td align="left" valign="top"><p class="table">font_size</p></td>
+<td align="left" valign="top"><p class="table">(<strong>double</strong>) size of fonts in vw, ranges between 1.0 and 2.0</p></td>
+</tr>
+<tr>
+<td align="left" valign="top"><p class="table">line_spacing</p></td>
+<td align="left" valign="top"><p class="table">(<strong>double</strong>) distance between text lines, ranges between 1.0 and 3.0</p></td>
+</tr>
+<tr>
+<td align="left" valign="top"><p class="table">color1</p></td>
+<td align="left" valign="top"><p class="table">(<strong>string</strong>) background color</p></td>
+</tr>
+<tr>
+<td align="left" valign="top"><p class="table">color2</p></td>
+<td align="left" valign="top"><p class="table">(<strong>string</strong>) primary table cell color</p></td>
+</tr>
+<tr>
+<td align="left" valign="top"><p class="table">color3</p></td>
+<td align="left" valign="top"><p class="table">(<strong>string</strong>) secondary table cell color</p></td>
+</tr>
+<tr>
+<td align="left" valign="top"><p class="table">color4</p></td>
+<td align="left" valign="top"><p class="table">(<strong>string</strong>) primary text color</p></td>
+</tr>
+<tr>
+<td align="left" valign="top"><p class="table">color5</p></td>
+<td align="left" valign="top"><p class="table">(<strong>string</strong>) secondary text color</p></td>
+</tr>
+<tr>
+<td align="left" valign="top"><p class="table">color6</p></td>
+<td align="left" valign="top"><p class="table">(<strong>string</strong>) border colors</p></td>
+</tr>
+</tbody>
+</table>
+</div>
+<div class="literalblock">
+<div class="title">template.html</div>
+<div class="content">
+<pre><code>        border-width: {{ template_options.borderwidth }}px;</code></pre>
+</div></div>
+<div class="literalblock">
+<div class="title">output.html</div>
+<div class="content">
+<pre><code>        border-width: 3px;</code></pre>
+</div></div>
+<div class="paragraph"><p>Another variable that <em>Subsurface</em> exports is <strong>print_options</strong>. This variable
+contains a single member:</p></div>
+<div class="tableblock">
+<table rules="all"
+width="100%"
+frame="border"
+cellspacing="0" cellpadding="4">
+<col width="50%" />
+<col width="50%" />
+<tbody>
+<tr>
+<td align="left" valign="top"><p class="table"><strong>Name</strong></p></td>
+<td align="left" valign="top"><p class="table"><strong>Description</strong></p></td>
+</tr>
+<tr>
+<td align="left" valign="top"><p class="table">grayscale</p></td>
+<td align="left" valign="top"><p class="table">Use <em>CSS</em> filters to convert the page into grayscale (should be added to body style to enable printing grayscale prints)</p></td>
+</tr>
+</tbody>
+</table>
+</div>
+<div class="literalblock">
+<div class="title">template.html</div>
+<div class="content">
+<pre><code>        body {
+                {{ print_options.grayscale }};
+        }</code></pre>
+</div></div>
+<div class="literalblock">
+<div class="title">output.html</div>
+<div class="content">
+<pre><code>        body {
+                -webkit-filter: grayscale(100%);
+        }</code></pre>
+</div></div>
+</div>
+<div class="sect2">
+<h3 id="_defined_css_selectors">19.3. Defined CSS selectors</h3>
+<div class="paragraph"><p>As the dive profile is placed after rendering, <em>Subsurface</em> uses a special
+<em>CSS</em> selectors to do some searches in the HTML output. The <em>CSS</em> selectors
+in the following table should be added.</p></div>
+<div class="tableblock">
+<table rules="all"
+width="100%"
+frame="border"
+cellspacing="0" cellpadding="4">
+<col width="33%" />
+<col width="33%" />
+<col width="33%" />
+<tbody>
+<tr>
+<td align="left" valign="top"><p class="table"><strong>Selector</strong></p></td>
+<td align="left" valign="top"><p class="table"><strong>Type</strong></p></td>
+<td align="left" valign="top"><p class="table"><strong>Description</strong></p></td>
+</tr>
+<tr>
+<td align="left" valign="top"><p class="table">dive_{{ dive.id }}</p></td>
+<td align="left" valign="top"><p class="table">id</p></td>
+<td align="left" valign="top"><p class="table">is used to fetch the relevant dive profile</p></td>
+</tr>
+<tr>
+<td align="left" valign="top"><p class="table">diveProfile</p></td>
+<td align="left" valign="top"><p class="table">class</p></td>
+<td align="left" valign="top"><p class="table">each div that will contain a dive profile should have this class selector in addition to the dive_{{ dive.id }} id selector</p></td>
+</tr>
+<tr>
+<td align="left" valign="top"><p class="table">dontbreak</p></td>
+<td align="left" valign="top"><p class="table">class</p></td>
+<td align="left" valign="top"><p class="table">prevents the div with this class to be divided into two pages, this can be used
+in flow layout templates only (when data-numberofdives = 0)</p></td>
+</tr>
+</tbody>
+</table>
+</div>
+<div class="admonitionblock">
+<table><tr>
+<td class="icon">
+<img src="./images/icons/important.png" alt="Important" />
+</td>
+<td class="content">Rendering dive profiles is not supported for flow layout templates (when
+data-numberofdives = 0).</td>
+</tr></table>
+</div>
+</div>
+<div class="sect2">
+<h3 id="_special_attributes">19.4. Special attributes</h3>
+<div class="paragraph"><p>There are two ways of rendering- either rendering a specific number of dives
+in each page or make <em>Subsurface</em> try to fit as much dives as possible into
+one page (<em>flow</em> rendering).</p></div>
+<div class="paragraph"><p>The <strong>data-numberofdives</strong> data attribute is added to the body tag to set the
+rendering mode</p></div>
+<div class="ulist"><ul>
+<li>
+<p>
+render 6 dives per page:
+</p>
+</li>
+</ul></div>
+<div class="literalblock">
+<div class="content">
+<pre><code>        &lt;body data-numberofdives = 6&gt;</code></pre>
+</div></div>
+<div class="ulist"><ul>
+<li>
+<p>
+render as much dives as possible:
+</p>
+</li>
+</ul></div>
+<div class="literalblock">
+<div class="content">
+<pre><code>        &lt;body data-numberofdives = 0&gt;</code></pre>
+</div></div>
+<div class="admonitionblock">
+<table><tr>
+<td class="icon">
+<img src="./images/icons/important.png" alt="Important" />
+</td>
+<td class="content">All CSS units should be in relative lengths only, to support printing on any
+page size.</td>
+</tr></table>
+</div>
+</div>
+</div>
+</div>
+<div class="sect1">
+<h2 id="_appendix_f_faqs">20. APPENDIX F: FAQs.</h2>
+<div class="sectionbody">
+<div class="sect2">
+<h3 id="S_APPENDIX_F">20.1. Subsurface appears to miscalculate gas consumption and SAC</h3>
+<div class="paragraph" id="SAC_CALCULATION"><p><em>Question</em>: I dived with a 12.2 l tank, starting with 220 bar and ending
+with 100 bar, and I calculate a different SAC compared what <em>Subsurface</em>
+calculates. Is <em>Subsurface</em> miscalculating?</p></div>
+<div class="paragraph"><p><em>Answer</em>: Not really. What happens is that <em>Subsurface</em> actually calculates
+gas consumption differently - and better - than you expect.  In particular,
+it takes the incompressibility of the gas into account.  Traditionally, Gas
+consumption and SAC should be: <code>consumption = tank size x (start pressure -
+end pressure)</code></p></div>
+<div class="paragraph"><p>and that&#8217;s true for an ideal gas, and it&#8217;s what you get taught in dive
+theory.  But an "ideal gas" doesn&#8217;t actually exist, and real gases actually
+don&#8217;t compress linearly with pressure. Also, you are missing the fact that
+one atmosphere of pressure isn&#8217;t actually one bar.  So the <strong>real</strong>
+calculation is:</p></div>
+<div class="paragraph"><p><code>consumption = (amount_of_air_at_beginning - amount_of_air_at_end)</code></p></div>
+<div class="paragraph"><p>where the amount of air is <strong>not</strong> just "tank size times pressure in bar".
+It&#8217;s a combination of: "take compressibility into account" (which is a
+fairly small issue under 220 bar - you&#8217;ll see more differences when you do
+high-pressure tanks with 300bar) and "convert bar to atm" (which is the
+majority of your discrepancy).  Remember: one ATM is ~1.013 bar, so without
+the compressibility, your gas use is:</p></div>
+<div class="paragraph"><p><code>12.2*((220-100)/1.013)</code></p></div>
+<div class="paragraph"><p>which is about 1445, not 1464. So there was 19 l too much in your simple
+calculation that ignored the difference between 1 bar and one ATM.  The
+compressibility does show up above 200 bar, and takes that 1445 down about
+eight litres more, so you really did use only about 1437 l of air at surface
+pressure.</p></div>
+<div class="paragraph"><p>So be happy: your SAC really is better than your calculations indicated.  Or
+be sad: your cylinder contains less air than you thought it did.  And as
+mentioned, the "contains less air than you thought it did" really 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">20.2. Some dive profiles have time discrepancies with the recorded samples from my dive computer&#8230;</h3>
+<div class="paragraph"><p><em>Subsurface</em> ends up ignoring surface time for many things (average depth,
+divetime, SAC, etc).  <em>Question</em>: Why do dive durations in my dive computer
+differ from that given by <em>Subsurface</em>?</p></div>
+<div class="paragraph"><p><em>Answer</em>: For example, if you end up doing a weight check (deep enough to
+trigger the "dive started")  but then come back up and wait five minutes for
+your buddies, your dive computer may say that your dive is 50 minutes long -
+because you have fifty minutes worth of samples - but 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>
+</div>
+<div class="sect2">
+<h3 id="_some_dive_profiles_are_missing_from_the_download">20.3. Some dive profiles are missing from the download</h3>
+<div class="paragraph" id="DC_HISTORY"><p><em>Question</em>: I cannot download all my dives, only the most recent ones even
+though my dive computer&#8217;s manual states that it records history of e.g. 999
+dives.</p></div>
+<div class="paragraph"><p><em>Answer</em>: Dive history is different than the dive profiles on the log.  The
+history only keeps track of the total number of dives and total amount of
+time spent below surface. The logs, on the other hand, store the dive
+profile, but they have limited amount of memory to do so. The exact amount
+of dive profiles that can be stored on the device depend on sample interval
+and duration of the dives. Once the memory is full the oldest dives get
+overwritten with new dives. Thus we are only able to download the last 13,
+30 or 199 dives.</p></div>
+<div class="paragraph"><p>If you have downloaded your dives to different dive logging software before
+they were overwritten, there is a high chance that Subsurface can import
+these. However, if the logs are only on your dive computer, they cannot be
+salvaged after being over written by new dives.</p></div>
+</div>
+</div>
+</div>
+</div>
+<div id="footnotes"><hr /></div>
+<div id="footer">
+<div id="footer-text">
+Last updated 2015-10-13 11:52:23 PDT
+</div>
+</div>
+</body>
+</html>
diff --git a/Documentation/user-manual_ru.html.git b/Documentation/user-manual_ru.html.git
index dce91ace8..ae38f945b 100644
--- a/Documentation/user-manual_ru.html.git
+++ b/Documentation/user-manual_ru.html.git
@@ -3,7 +3,7 @@
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="ru">
 <head>
 <meta http-equiv="Content-Type" content="application/xhtml+xml; charset=UTF-8" />
-<meta name="generator" content="AsciiDoc 8.6.8" />
+<meta name="generator" content="AsciiDoc 8.6.9" />
 <title></title>
 <style type="text/css">
 /*
@@ -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">Руководство пользователя</span></p></div>
 <div class="paragraph"><p><strong>Авторы документа</strong>: Willem Ferguson, Jacco van Koll, Dirk Hohndel, Reinout Hoornweg,
 Linus Torvalds, Miika Turkia, Amit Chaudhuri, Jan Schubert, Salvador Cuñat, Pedro Neves</p></div>
-<div class="paragraph"><p><span class="blue"><em>Версия 4.4, Февраль 2014</em></span></p></div>
+<div class="paragraph"><p><span class="blue"><em>Версия 4.5, Октябрь 2015</em></span></p></div>
 <div class="paragraph"><p>Вас приветствует <em>Subsurface</em>, современная программа для ведения журнала
 погружений с возможностями организации, документирования, анализа и печати
 погружений для SCUBA и фридайверов. <em>Subsurface</em> предлагает множество
@@ -452,6 +452,12 @@ Linus Torvalds, Miika Turkia, Amit Chaudhuri, Jan Schubert, Salvador Cuñat, Ped
    принимает во внимание ранее выполненные погружения?
 </p>
 </li>
+<li>
+<p>
+Вам нужно хранить или создавать резервные копии журнала погружения в Интернет, с
+   возможностью доступа к журналу откуда угодно, используя веб-броузер?
+</p>
+</li>
 </ul></div>
 <div class="paragraph"><p>Установочные образы <em>Subsurface</em> доступны для Windows PC (Win XP и позже),
 Intel Mac (OS/X) и множества дистрибутивов Linux. <em>Subsurface</em> может быть
@@ -462,7 +468,7 @@ libdivecomputer.</p></div>
 <em>Subsurface</em></a>.  Вы можете обсудить эту программу, отправив email на адрес
 <a href="mailto:subsurface@subsurface-divelog.org">списка рассылки</a> и сообщить об ошибках на сайте
 <a href="http://trac.hohndel.org">треккера ошибок</a>. Инструкции по самостоятельной сборке
-и, если необходимо, зависимостей, описаны в файле INSTALL, распространяемом
+<em>Subsurface</em> и, если необходимо, зависимостей, описаны в файле INSTALL, распространяемом
 вместе с исходными текстами.</p></div>
 <div class="paragraph"><p><strong>Аудитория</strong>: Рекреационные, технические и коммерческие дайверы, фридайверы</p></div>
 <div id="toc">
@@ -473,11 +479,7 @@ libdivecomputer.</p></div>
 <h2 id="S_UserSurvey">1. Работа с этим руководством</h2>
 <div class="sectionbody">
 <div class="paragraph"><p>Если руководство открыто из <em>Subsurface</em>, то вы не увидите никаких элементов
-<<<<<<< HEAD
-управления. Однака важная функция <em>поиска</em> доступна по нажатию комбинации клавиш
-=======
 управления. Однако важная функция <em>поиска</em> доступна по нажатию комбинации клавиш
->>>>>>> v4.4-branch
 control-F или command-F. Используйте текстовое поле в нижней части экрана для поиска
 нужной информации в руководстве.</p></div>
 </div>
@@ -543,7 +545,7 @@ control-F или command-F. Используйте текстовое поле 
 общее время на дне и количество погружений).</p></div>
 <div class="imageblock" id="S_ViewPanels" style="text-align:center;">
 <div class="content">
-<img src="images/main_window_f20.jpg" alt="Главное окно" />
+<img src="images/main_window_f22.jpg" alt="Главное окно" />
 </div>
 </div>
 <div class="paragraph"><p>Вы можете выбрать какие из панелей показывать на главном экране.  Для этого
@@ -576,13 +578,8 @@ control-F или command-F. Используйте текстовое поле 
 <div class="sect1">
 <h2 id="S_GetInformation">5. Сохранение погружений в журнале</h2>
 <div class="sectionbody">
-<<<<<<< HEAD
-<div class="paragraph"><p>Теперь, когда создан новый журоанл, очень просто добавить погружения к нему.
-<em>Subsurface</em> предлашает несколько способов добавления погружений, которые подробно
-=======
 <div class="paragraph"><p>Теперь, когда создан новый журнал, очень просто добавить погружения к нему.
 <em>Subsurface</em> предлагает несколько способов добавления погружений, которые подробно
->>>>>>> v4.4-branch
 описаны далее:</p></div>
 <div class="paragraph"><p>1) Если вы ведете бумажный журнал, храните информацию в электронной таблице или
 используете другой ручной способ, данные о погружениях могут быть добавлены с
@@ -597,11 +594,6 @@ control-F или command-F. Используйте текстовое поле 
 </li>
 <li>
 <p>
-<<<<<<< HEAD
-Импорт данных из журнала, который велся в электронной таблице или в виже CSV-файла.
- Обратитесь к главам <a href="#S_Appendix_D">ПРИЛОЖЕНИЕ Г: Экспорт таблиц в CSV формат</a> и
- <a href="#S_ImportingCSVDives">Импорт погружений в CSV формате</a>.
-=======
 Импорт данных из журнала, который велся в электронной таблице или в виде CSV-файла.
  Обратитесь к главам <a href="#S_Appendix_D">ПРИЛОЖЕНИЕ Г: Экспорт таблиц в CSV формат</a> и
  <a href="#S_ImportingCSVDives">Импорт погружений в CSV формате</a>.
@@ -615,35 +607,16 @@ control-F или command-F. Используйте текстовое поле 
 <li>
 <p>
 Непосредственно дайв-компьютера. Смотрите главу <a href="#S_ImportDiveComputer">Импорт данных нового погружения из дайв-компьютера</a> или
->>>>>>> v4.4-branch
-</p>
-</li>
-</ul></div>
-<div class="paragraph"><p>2) Если ваши погружения записаны в дайв-компьютере, вы можете получить значительное
- количество информации, включая профиль погружения. Погружения могут быть импортированы
- из:</p></div>
-<div class="ulist"><ul>
-<li>
-<p>
-<<<<<<< HEAD
-Непосредственно дайв-компьютера. Смотрите главу <a href="#S_ImportDiveComputer">Импорт данных нового погружения из дайв-компьютера</a> или
-=======
-Стороннего программного обеспечения, распространяемого производителями дайв-компьютеров.
- Обратитесь к <a href="#S_ImportingAlienDiveLogs">Импорт погружений из других источников и форматов данных</a>.
->>>>>>> v4.4-branch
 </p>
 </li>
 <li>
 <p>
-<<<<<<< HEAD
 Стороннего программного обеспечения, распространяемого производителями дайв-компьютеров.
  Обратитесь к <a href="#S_ImportingAlienDiveLogs">Импорт погружений из других источников и форматов данных</a>.
 </p>
 </li>
 <li>
 <p>
-=======
->>>>>>> v4.4-branch
 Импорт из электронных таблиц и CSV-файлов, содержащих профили погружений. Смотрите
  <a href="#S_ImportingCSVDives">Импорт погружений в CSV-формате из дайв-компьютеров и другого ПО для ведения журналов</a>.
 </p>
@@ -659,12 +632,12 @@ control-F или command-F. Используйте текстовое поле 
 информации о каждом отдельном дайве. Чтобы добавить новый дайв в журнал
 выберите в главном меню <em>Журнал &#8594; Добавить погружение</em>. Программа при этом
 покажет три области, доступных для ввода данных: две вкладки на информационной
-панели (<strong>Погружение</strong> и <strong>Снаряжение</strong>) и панель <strong>Профиль</strong> с графиком погружения.
+панели (<strong>Примечания</strong> и <strong>Снаряжение</strong>) и панель <strong>Профиль</strong> с графиком погружения.
 Эти области отмечены соответственно как <span class="red">A</span>, <span class="red">B</span> и <span class="red">C</span> на
 картинке ниже. Далее будет пояснено как вводить данные.</p></div>
 <div class="imageblock" style="text-align:center;">
 <div class="content">
-<img src="images/AddDive1_f20.jpg" alt="Рисунок: Добавление погружения" />
+<img src="images/AddDive1_f22.jpg" alt="Рисунок: Добавление погружения" />
 </div>
 </div>
 <div class="paragraph"><p>Когда вы щелкаете мышью в одном из полей указанных панелей, вы переходите в
@@ -672,195 +645,16 @@ control-F или command-F. Используйте текстовое поле 
 верхней части.</p></div>
 <div class="imageblock" style="text-align:center;">
 <div class="content">
-<img src="images/BlueEditBar_f20.jpg" alt="Blue edit bar" />
+<img src="images/BlueEditBar_f22.jpg" alt="Синяя полоса редактирования" />
 </div>
 </div>
 <div class="paragraph"><p>Не нажимайте на кнопку <em>Применить изменения</em> до тех пор, пока вы не ввели все данные.
-При ручном вводе вам нужно заполнить поля на вкладках <em>Погружение</em>, <em>Снаряжение</em> и
+При ручном вводе вам нужно заполнить поля на вкладках <em>Примечания</em>, <em>Снаряжение</em> и
 <em>Профиль</em> перед сохранением. При нажатии кнопки <em>Применить изменения</em>, информация о
 погружении сохраняется в памяти. При закрытии <em>Subsurface</em> вам будет предложено
 сохранить весь журнал на диск.</p></div>
 <div class="sect3">
-<h4 id="_погружение">5.1.1. Погружение</h4>
-<div class="paragraph"><p>Эта вкладка содержит дату, время и местоположение отдельно взятого дайва,
-природные условия, список партнеров, а также заметки к погружению.
-Рассмотрим подробнее поля ввода, доступные на вкладке <strong>Погружение</strong>:</p></div>
-<div class="imageblock" style="text-align:center;">
-<div class="content">
-<img src="images/AddDive2_f20.jpg" alt="Рисунок: Вкладка  Погружение" />
-</div>
-</div>
-<div class="paragraph"><p>Поля <strong>Дата</strong> и <strong>Время</strong> соответствуют дате и времени дайва.  При нажатии мышкой
-на поле даты отображается выпадающий календарь, в котором можно выбрать
-необходимую дату.  Нажмите ESC чтобы закрыть календарь. Значение времени (часы
-и минуты) можно также непосредственно поменять, для чего необходимо нажать
-мышкой в нужном месте текстового поля и ввести цифры. По умолчанию выбрана
-текущая дата и время на час больше текущего.</p></div>
-<div class="paragraph"><p><strong>Температура воды и воздуха</strong> во время дайва. Значения можно вводить прямо в
-поля. Единицы измерения заполнять не нужно, они будут автоматически
-подставлены программой (единицы, выбранные в *Настройках* указывают будет ли
-использоваться метрическая или имперская система мер).</p></div>
-<div class="paragraph"><p><strong>Местоположение</strong>: В этом поле можно указать название дайв-сайта, например,
-«Эль-Мина рэк, Хургада, Египет». Если вы часто погружаетесь в одном месте,
-автодополнение поможет вам быстро ввести название сайта.</p></div>
-<div class="paragraph"><p><strong>Координаты</strong>: В этом поле можно указать географические координаты дайв-сайта.
-Их можно получить тремя способами:</p></div>
-<div class="paragraph"><p>а. Выбрать на карте, которая находится в правой нижней части окна
-<em>Subsurface</em>. На карте отображается зеленая полоса с надписью «Выберите место
-на карте двойным щелчком мыши». При двойном нажатии в соответствующем месте
-<<<<<<< HEAD
-карты, зеленая полоса исчезнет и координаты точки будут заполнены в поле.
-</p>
-</li>
-<li>
-<p>
-Координаты могут быть получены с помощью вспомогательного приложения
-<em>Subsurface</em>, если у вас есть устройство Android или iPhone с GPS-датчиком
-и координаты дайв-сайта были сохранены в этом устройстве.
-<a href="#S_Companion">Нажмите, чтобы узнать больше</a>
-</p>
-</li>
-<li>
-<p>
-Если вам известны координаты, их можно ввести вручную в одном из четырех
-форматов, сначала широта, потом долгота:
-</p>
-=======
-карты, зеленая полоса исчезнет и координаты точки будут заполнены в поле.</p></div>
-<div class="paragraph"><p>б. Координаты могут быть получены с помощью вспомогательного приложения
-<em>Subsurface</em>, если у вас есть устройство Android или iPhone с GPS-датчиком
-и координаты дайв-сайта были сохранены в этом устройстве.
-<a href="#S_Companion">Нажмите, чтобы узнать больше</a></p></div>
-<div class="paragraph"><p>в. Если вам известны координаты, их можно ввести вручную в одном из четырех
-форматов, сначала широта, потом долгота:</p></div>
->>>>>>> v4.4-branch
-<div class="literalblock">
-<div class="content">
-<pre><code>ISO 6709 Приложение D, например 30°13'28.9"Ю 30°49'1.5"В
-Градусы и десятичные минуты, например, Ю30° 13.49760' , В30° 49.30788'
-Градусы минуты секунды, например, Ю30° 13' 29.8" , В30° 49' 1.5"
-Десятичные градусы, например, 30.22496 , 30.821798</code></pre>
-</div></div>
-<div class="paragraph"><p>Широта южного полушария указывается с буквой <strong>Ю</strong>, например, Ю30°, или со
-знаком минус, например, -30.22496. Аналогично, долгота западного полушария
-указывается с буквой <strong>З</strong>, например, З07°, или со знаком минус, например,-7.34323.</p></div>
-<div class="paragraph"><p>На некоторых клавиатурах отсутствует символ градуса (°). В этом случае его можно заменить
-английской буквой d, например: С30d З20d.</p></div>
-<div class="paragraph"><p>Важно отметить, что координаты GPS привязаны к названию дайв-сайта, поэтому
-указание координат для погружений, у которых не указано местоположение, может
-привести к непредсказуемым результатам (<em>Subsurface</em> будет предлагать, что все
-эти погружения были в одном месте и имеют одинаковые координаты).</p></div>
-<div class="paragraph"><p><strong>Режим погружения</strong>: С помощью выпадающего списка вы можете выбрать режим погружения. Вам
-предоставляются следующие варианты: OC (открытый цикл, значение по умолчанию, подходит для большинства рекреационных дайверов),
-Freedive (погружение без дыхательного аппарата), CCR (ребризер замкнутого цикла) и pSCR (
-пассивный полу-замкнутый ребризер).</p></div>
-<div class="paragraph"><p><strong>Инструктор</strong>: Имя гида или дайв-мастера, с которым производилось это
-погружение. Это поле также производит автодополнение на основании списка всех
-инструкторов в текущем журнале.</p></div>
-<div class="paragraph"><p><strong>Партнер</strong>: Имя или имена партнеров (разделенные запятой), с которыми
-выполнялось данное погружение. Это поле делает автодополнение на основании
-списка всех партнеров в текущем журнале.</p></div>
-<div class="paragraph"><p><strong>Костюм</strong>: Тип костюма в котором осуществлялось погружение. Как и с другими
-полями, для него доступно автодополнение. Если вы ныряете в сухом костюме, то
-можете также указать тип утеплителя и его теплозащиту.</p></div>
-<div class="paragraph"><p><strong>Оценка</strong>: Ваша субъективная оценка этого погружения по 5-ти бальной шкале.
-Укажите рейтинг, нажав на соответствующей звездочке.</p></div>
-<div class="paragraph"><p><strong>Видимость</strong>: Видимость под водой, как и в предыдущем случае, оценивается по
-5-ти бальной шкале.</p></div>
-<div class="paragraph"><p><strong>Метки</strong>: Набор меток (разделенных запятой), описывающих это погружение,
-например: ночное, пещера, течение и т. п. <em>Subsurface</em> предоставляет также
-набор встроенных меток. Автодополнение доступно для этого поля. Например,
-набрав <code>cav</code>, вам предложат на выбор метки <strong>cave</strong> и <strong>cavern</strong>.</p></div>
-<div class="paragraph"><p><strong>Примечания</strong>: В это поле можно ввести любую дополнительную информацию.</p></div>
-<div class="paragraph"><p>Кнопки <strong>Сохранить</strong> и <strong>Отмена</strong> используются для сохранения информации на всех
-вкладках информационной панели и профиля погружения, поэтому нет необходимости
-нажимать их до тех пор, пока вы не заполнили ВСЮ информацию. Ниже приведен
-пример полностью заполненной информационной панели:</p></div>
-<div class="imageblock" style="text-align:center;">
-<div class="content">
-<img src="images/CompletedDiveInfo_f20.jpg" alt="Рисунок: Заполненная вкладка Погружение" />
-</div>
-</div>
-</div>
-<div class="sect3">
-<h4 id="_снаряжение">5.1.2. Снаряжение</h4>
-<div class="paragraph"><p>Вкладка Снаряжение позволяет ввести информацию об используемых баллонах и
-газах, а также грузовых системах. Информация о баллонах и смесях влияет на
-поведение профиля погружения (верхняя правая панель).</p></div>
-<div class="paragraph" id="S_CylinderData"><p><strong>Баллоны</strong>: Ввод информации о баллонах осуществляется с помощью диалога,
-изображенного на следующей картинке:</p></div>
-<div class="imageblock" style="text-align:center;">
-<div class="content">
-<img src="images/Gas_dialogue1_f20.jpg" alt="Рисунок: Начальный вид диалога редактирования баллонов" />
-</div>
-</div>
-<div class="paragraph"><p>Кнопка + в правом верхнем углу добавляет новый баллон к текущему погружению.
-Темная иконка с изображением мусорной корзины удаляет выбранный баллон, однако
-только в том случае, если этот баллон уже не используется в погружении. Всегда
-существует как минимум один баллон, даже если вы не создавали события замены
-смеси, и его нельзя удалить прежде чем будет добавлен другой.</p></div>
-<div class="paragraph"><p>Начните с выбора типа баллона из выпадающего списка в левой части таблицы. Для
-этого нажмите на ячейке в колонке <strong>Тип</strong>:</p></div>
-<div class="imageblock" style="text-align:center;">
-<div class="content">
-<img src="images/Gas_dialogue2_f20.jpg" alt="Рисунок: Список типов баллонов" />
-</div>
-</div>
-<div class="paragraph"><p>Вы можете использовать выпадающий список для выбора типа баллона для
-погружения, а можете начать вводить название типа с помощью клавиатуры. В этом
-случае вам будут предложены совпадающие типы. Поля <strong>Объем</strong> и <strong>Рабочее
-давление</strong> будут заполнены автоматически. Если баллон отсутствует в списке,
-укажите его название и описание в поле <strong>Тип</strong></p></div>
-<div class="paragraph"><p>Далее укажите начальное и конечное давление газа в баллоне. Единицы измерения
-давления (метрическая/имперская система мер) будут взяты из <em>Настроек</em>.</p></div>
-<div class="paragraph"><p>Наконец, укажите состав используемой смеси в поле <strong>O₂%</strong>. Если используется
-воздух, то можно указать значение 21% или вовсе оставить это поле пустым. В
-случае использования Nitrox или Trimix, необходимо указать процентное
-содержание кислорода и гелия в соответствующих полях.
-Прочие ненужные поля следует оставить незаполненными. После ввода всей
-необходимой информации нажмите клавишу <em>ENTER</em> либо щелкните курсором мыши вне
-ячейки, в которой находится курсор. Информация о дополнительных баллонах может
-быть добавлена нажатием на кнопку + в правом верхнем углу. Ниже приведен
-пример погружения с двумя баллонами (воздух и EAN50):</p></div>
-<div class="imageblock" style="text-align:center;">
-<div class="content">
-<img src="images/CylinderDataEntry3_f20.jpg" alt="Рисунок: заполненная таблица баллонов" />
-</div>
-</div>
-<div class="paragraph"><p><strong>Грузы</strong>: Информация о грузовых системах, используемых во время погружения,
-вводится таким же образом, как и информация о баллонах. Если нажать на кнопку
-+ в правом верхнем углу, таблица будет выглядеть приблизительно так:</p></div>
-<div class="imageblock" style="text-align:center;">
-<div class="content">
-<img src="images/WeightsDataEntry1_f20.jpg" alt="Рисунок: Редактирование грузовых систем" />
-</div>
-</div>
-<div class="paragraph"><p>При нажатии мышкой в поле <strong>Тип</strong>, выпадающий список можно вызвать, нажав
-клавишу вниз:</p></div>
-<div class="imageblock" style="text-align:center;">
-<div class="content">
-<img src="images/WeightsDataEntry2_f20.jpg" alt="Рисунок: Список типов грузов" />
-</div>
-</div>
-<div class="paragraph"><p>Вы можете использовать выпадающий список для выбора типа груза, либо начать
-вводить название с помощью клавиатуры. В этом случае вам будут предложены
-совпадающие типы. После выбора типа груза, укажите его вес в поле <strong>Вес</strong>.
-Нажмите клавишу <em>ENTER</em> либо щелкните курсором мыши вне ячейки, в которой
-находится курсор. Если вам нужно добавить дополнительную грузовую систему,
-нажмите на кнопке + в правом верхнем углу. Чтобы удалить груз, нажмите на
-иконку с изображением мусорной корзины.
-Вот пример заполненной таблицы с двумя грузовыми системами: интегрированная и
-пояс:</p></div>
-<div class="imageblock" style="text-align:center;">
-<div class="content">
-<img src="images/WeightsDataEntry3_f20.jpg" alt="Рисунок: Заполненная таблица грузов" />
-</div>
-</div>
-<div class="paragraph"><p>Не нужно нажимать кнопку <em>Сохранить</em> до тех пор, пока вы не закончили
-редактирование профиля погружения.</p></div>
-</div>
-<div class="sect3">
-<h4 id="S_CreateProfile">5.1.3. Создание профиля погружения</h4>
+<h4 id="S_CreateProfile">5.1.1. Создание профиля погружения</h4>
 <div class="paragraph"><p><strong>Профиль погружения</strong> (графическое представление глубины дайва как функции
 от времени) отображается в правой верхней панели окна <em>Subsurface</em>. В случае
 ручного добавления погружения в журнал, <em>Subsurface</em> предлагает начальный
@@ -904,24 +698,10 @@ Freedive (погружение без дыхательного аппарата)
 <img src="images/DiveProfile3_f20.jpg" alt="Рисунок: Меню выбора газовой смеси" />
 </div>
 </div>
-<div class="paragraph"><p>Ниже в качестве примера показан профиль погружения на 20м в течение 30 минут и
-переходом на EAN50 в конце сегмента на 20м. В этом случае на вкладке <strong>Снаряжение</strong> было
-добавлено два баллона: первый с воздухом и второй с EAN50.</p></div>
-<div class="imageblock" style="text-align:center;">
-<div class="content">
-<img src="images/DiveProfile4_f20.jpg" alt="Рисунок: Окончательный профиль погружения" />
-</div>
-</div>
-</div>
-<div class="sect3">
-<h4 id="_сохранение_погружения_введенного_вручную">5.1.4. Сохранение погружения, введенного вручную</h4>
-<div class="paragraph"><p>После того, как вы ввели все необходимую информацию на вкладках <strong>Погружение</strong>,
-<strong>Снаряжение</strong>, а также отредактировали профиль, необходимо сохранить данные
-погружения в журнале. В правой верхней части вкладки <strong>Погружение</strong> находятся
-две кнопки на голубом фоне. При нажатии на кнопку <em>Применить изменения</em>, погружение
-сохраняется в текущем журнале. Обратите внимание, что сохранение дайва в журнале
-не сохраняет сам журнал. При выходе из <em>Subsurface</em> вам будет предложено
-сохранить сам журнал.</p></div>
+<div class="paragraph"><p>После того, как профиль погружения был задан, необходимо указать дополнительные детали.
+Используйте для этого вкладки <strong>Примечания</strong> и <strong>Снаряжение</strong>, находящиеся в верхней левой
+части окна <em>Subsurface</em>. Перейдите по <a href="#S_Notes_dc"><strong>этой ссылке</strong></a> для получения более
+подробной информации.</p></div>
 </div>
 </div>
 <div class="sect2">
@@ -987,10 +767,7 @@ Freedive (погружение без дыхательного аппарата)
 По этой причине <em>Subsurface</em> импортирует только те дайвы, которые еще не были
 загружены ранее. Это значительно ускоряет процесс импорта из большинства
 дайв-компьютеров, а также предохраняет батарею от разряда (если конечно ваш
-дайв-компьютер не заряжается, будучи подключенным к USB-порту). Если же по
-какой-то причине вам необходимо загрузить все погружения из памяти
-дайв-компьютера, даже если они уже есть в журнале, поставьте галочку в поле
-<em>Принудительная загрузка всех погружения</em>.</p></div>
+дайв-компьютер не заряжается, будучи подключенным к USB-порту).</p></div>
 <div class="ulist"><ul>
 <li>
 <p>
@@ -1047,37 +824,20 @@ Freedive (погружение без дыхательного аппарата)
 </li>
 <li>
 <p>
-<<<<<<< HEAD
-Нажмите кнопку <em>Загрузить</em>. После успешной загрузки диалоговое окно будет выглядет
-  как показано на рисунке <strong>B</strong>.
-=======
-Нажмите кнопку <em>Загрузить</em>. После успешной загрузки диалоговое окно будет
-  выглядеть как показано на рисунке <strong>B</strong>.
->>>>>>> v4.4-branch
-</p>
-</li>
-<li>
-<p>
-При установленном соединении вы можете наблюдать как загружаются данные из
-  дайв-компьютера. В зависимости от модели компьютера и количества погружений
-  в памяти последнего, импорт может занять довольно долгое время, будьте
-  терпеливы. Бегущая полоса, показывающая процесс загрузки, может не совсем
+Нажмите кнопку <em>Загрузить</em>. При установленном соединении вы можете наблюдать
+  как загружаются данные из дайв-компьютера. В зависимости от модели компьютера
+  и количества погружений в памяти последнего, импорт может занять довольно долгое время,
+  будьте терпеливы. Бегущая полоса, показывающая процесс загрузки, может не совсем
   точно отражать скорость загрузки, так как зачастую <em>Subsurface</em> не знает
-  точно сколько погружений будет загружено до тех пор, пока импорт не
-  завершен. После окончания загрузки отключите дайв-компьютер и выключите его
+  точно сколько погружений будет загружено до тех пор, пока импорт не завершен.
+  После загрузки погружений они отобразятся в в виде таблицы в правой части окна
+  (как показано на рисунке <strong>В</strong> выше). Проставьте галочки напротив тех погружений,
+  которые должны быть перенесены в <strong>Список погружений</strong> и нажмите кнопку <strong>OK</strong>.
+  Окно загрузки будет закрыто, а выбранные погружения появятся в списке.
+  После окончания загрузки отключите дайв-компьютер и выключите его
   для экономии заряда батареи.
 </p>
 </li>
-</ul></div>
-<<<<<<< HEAD
-<div class="paragraph"><p>После загрузки погружений они отобразятся в ввиде таблицы в правой части окна
-=======
-<div class="paragraph"><p>После загрузки погружений они отобразятся в в виде таблицы в правой части окна
->>>>>>> v4.4-branch
-(как показано на рисунке <strong>В</strong> выше). Проставьте галочки напротив тех погружений,
-которые должны быть перенесены в <strong>Список погружений</strong> и нажмите кнопку <strong>OK</strong>.
-Окно загрузки будет закрыто, а выбранные погружения появятся в списке.</p></div>
-<div class="ulist"><ul>
 <li>
 <p>
 В случае возникновения проблем связи с дайв-компьютером показывается
@@ -1155,14 +915,151 @@ Freedive (погружение без дыхательного аппарата)
 <pre><code>subsurface.log
 subsurface.bin</code></pre>
 </div></div>
-<div class="paragraph"><p>Эти файлы следует отправить разработчикам в <a href="mailto:subsurface@subsurface-divelog.org">
-список рассылки</a> с просьбой проанализировать проблему. Необходимо указать
+<div class="paragraph"><p>Эти файлы следует отправить разработчикам в mailto:subsurface@subsurface-divelog.org
+[список рассылки] с просьбой проанализировать проблему. Необходимо указать
 производителя и модель дайв-компьютера и дать словесное описание загружаемых
 погружений.</p></div>
 </div></div>
 </div>
 <div class="sect3">
-<h4 id="S_DeviceNames">5.2.2. Изменение названия дайв-компьютера</h4>
+<h4 id="S_Bluetooth">5.2.2. Подключение <em>Subsurface</em> к дайв-компьютеру через Bluetooth</h4>
+<div class="paragraph"><p>Bluetooth все чаще встречается в качестве интерфейса для взаимодействия с дайв-компьютерами,
+например Shearwater Petrel Mk2 и OSTC Mk3. <em>Subsurface</em> предоставляет интерфейс взаимодействия
+с Bluetooth, слабо зависящий от операционной системы. Нестройка Bluetooth-соединения в <em>Subsurface</em>
+требует выполнения четырех шагов:</p></div>
+<div class="ulist"><ul>
+<li>
+<p>
+Удостоверьтесь, что Bluetooth активирован на вашем персональном компьютере.
+</p>
+</li>
+<li>
+<p>
+Убедитесь, что <em>Subsurface</em> распознает адаптер Bluetooth на этом компьютере.
+</p>
+</li>
+<li>
+<p>
+Проверьте, что дайв-компьютер переведен в режим связи с ПК и его можно обнаружить через Bluetooth.
+</p>
+</li>
+<li>
+<p>
+Проверьте, чтобы <em>Subsurface</em> был сопряжен с дайв-компьютером.
+</p>
+</li>
+</ul></div>
+<div class="paragraph"><p>Перейдите в окно "Загрузка из дайв-компьютера", выбрав в <strong>Главном меню</strong> <em>Импорт &#8594; Импорт из
+дайв-компьютера</em>. Если поставить галочку напротив пункта <em>Загрузка через Bluetooth</em>,
+вам будет представлено следующее окно:</p></div>
+<div class="sect4">
+<h5 id="_linux_или_macos">Linux или MacOS:</h5>
+<div class="imageblock" style="text-align:center;">
+<div class="content">
+<img src="images/DC_import_Bluetooth.jpg" alt="Рисунок: Сопряжение устройств Bluetooth" />
+</div>
+</div>
+<div class="paragraph"><p>На платформах <em>Linux</em> и <em>MacOS</em> в правой части окна показывается название
+компьютера, на котором запущен <em>Subsurface</em>, и его адрес Bluetooth. Если на
+компьютере найдено более одного локального Bluetooth-адаптера, то они будут
+представлены в выпадающем списке и вы можете указать тот, который необходимо
+использовать. Кнопка ниже позволяет включить ии выключить питание локального
+Bluetooth-адаптера.</p></div>
+<div class="paragraph"><p>Если Bluetooth-адрес не указан, это означает, что <em>Subsurface</em> не может распознать локальное
+Bluetooth-устройство. Убедитесь, что на компьютере установлен драйвер адаптера и проверьте, что
+он может использоваться другими программами для работы с Bluetooth (<em>bluetoothctl</em> или <em>bluemoon</em>).
+Эти шаги покрывают первые два из из перечисленных выше.</p></div>
+<div class="paragraph"><p>Проверьте, что дайв-компьютер переведен в режим связи с ПК и его можно обнаружить через Bluetooth.
+Обратитесь к руководству пользователя вашего дайв-компьютера, чтобы сделать это. Это действие
+завершает третий шаг.</p></div>
+<div class="paragraph"><p>Нажмите на кнопку <em>Сканировать</em> в левой нижней части окна. Спустя небольшое
+время поиска, ваш дайв-компьютер должен появиться в списке обнаруженных
+устройств (возможно наряду с другими найденными устройствами) в левой части
+диалогового окна (см. картинку выше). Если компьютер в списке не появился,
+нажмите кнопку <em>Очистить</em> и повторите процедуру сканирования. В итоге
+<em>Subsurface</em> должен обнаружить дайв-компьютер. В списке обнаруженных устройств
+показывается их название, адрес и статус сопряжения. Если устройство не
+сопряжено и подсвечено красным цветом, щелкните на нем правой кнопкой мыши и из
+контекстного меню выберите пункт <em>Сопряжение</em>. Дождитесь окончания этого
+действия.</p></div>
+<div class="sidebarblock">
+<div class="content">
+<div class="admonitionblock">
+<table><tr>
+<td class="icon">
+<img src="images/icons/important.png" alt="Важно" />
+</td>
+<td class="content">В настоящий момент <em>Subsurface</em> не поддерживает сопряжение с дайв-компьютерами, которые требуют
+собственный PIN-код. В этом случае для сопряжения используйте другие утилиты операционной системы
+так, как это предложено ниже.</td>
+</tr></table>
+</div>
+<div class="paragraph"><p>Один и способов сопряжения - использование утилиты <code>bluetoothctl</code>:</p></div>
+<div class="literalblock">
+<div class="content">
+<pre><code>$ bluetoothctl
+[bluetooth]# agent KeyboardOnly
+Agent registered
+[bluetooth]# default-agent
+Default agent request successful
+[bluetooth]# pair 00:80:25:49:6C:E3
+Attempting to pair with 00:80:25:49:6C:E3
+[CHG] Device 00:80:25:49:6C:E3 Connected: yes
+Request PIN code
+[agent] Enter PIN code: 0000</code></pre>
+</div></div>
+</div></div>
+<div class="paragraph"><p>После сопряжения устройств можно нажать на кнопку <em>Сохранить</em>. Окно выбора
+Bluetooth-устройства будет закрыто. Теперь в окне <em>Загрузка из дайв-компьютера</em>
+нажмите кнопку <em>Загрузить</em>. Загруженные погружения будут показаны в списке в
+правой части окна.</p></div>
+</div>
+<div class="sect4">
+<h5 id="_windows">Windows</h5>
+<div class="imageblock" style="text-align:center;">
+<div class="content">
+<img src="images/DC_import_Bluetooth_Windows.png" alt="Рисунок: Сопряжение устройств Bluetooth в Windows" />
+</div>
+</div>
+<div class="paragraph"><p>На платформе <em>Windows</em> детали локального Bluetooth-адаптера не отображаются.
+Для успешного обнаружения дайв-компьютера убедитесь, что на вашем компьютере
+включен Bluetooth. Используйте кнопку <em>Сканировать</em> для обнаружения устройств.</p></div>
+<div class="paragraph"><p>Сопряжение устройств происходит автоматически при загрузке погружений. Если до
+этого устройства никогда не были сопряжены, операционная система запросит
+подтверждение и выведет уведомление в правой части экрана: <em>Добавление устройства,
+нажмите чтобы настроить ваш дайв-компьютер</em>. Вам необходимо подтвердить сопряжение.
+Выберите устройство из списка обнаруженных и нажмите  кнопку <em>Сохранить</em>. В окне
+<em>Загрузка из дайв-компьютера</em> нажмите кнопку <em>Загрузить</em> и дождитесь окончания процесса.</p></div>
+<div class="admonitionblock">
+<table><tr>
+<td class="icon">
+<img src="images/icons/important.png" alt="Важно" />
+</td>
+<td class="content">Учтите, что в настоящий момент <em>Subsurface</em> работает только с локальными Bluetooth-адаптерами,
+использующими стэк Microsoft Bluetooth. Прочие, использующие драйверы <em>Widcomm</em>,
+<em>Stonestreet One Bluetopia Bluetooth</em> или <em>BlueSolei</em>, заведомо работать не будут.</td>
+</tr></table>
+</div>
+<div class="paragraph"><p>Информационное сообщение в левой нижней части окна выбора Bluetooth-устройства
+показывает текущее состояние агента Bluetooth. Для выбора другого устройства,
+вызовите окно выбора Bluetooth-устройства нажатием на кнопку с троеточием
+справа от галочки <em>Загрузка через Bluetooth</em></p></div>
+<div class="admonitionblock">
+<table><tr>
+<td class="icon">
+<img src="images/icons/important.png" alt="Важно" />
+</td>
+<td class="content"><strong>В случае возникновения проблем</strong>: Если локальный Bluetooth-адаптер на компьютере с <em>Subsurface</em>
+"завис" и загрузка погружений постоянно завершается с ошибкой, <em>удалите</em> сопряжение с устройством
+и повторите шаги, перечисленные выше. Если и это не помогло, в
+<a href="#S_HowFindBluetoothDeviceName"><em>Приложении А</em></a> вы сможете найти информацию о том, как вручную
+настроить и проверить соединение с <em>Subsurface</em>.</td>
+</tr></table>
+</div>
+</div>
+</div>
+<div class="sect3">
+<h4 id="S_DeviceNames">5.2.3. Изменение названия дайв-компьютера</h4>
 <div class="paragraph"><p>Может возникнуть ситуация, когда вам будет необходимо каким-то образом
 различать дайв-компьютеры, используемые совместно с <em>Subsurface</em>. Например,
 если у вас с напарником одинаковые дайв-компьютеры и вы их используете для
@@ -1177,25 +1074,29 @@ subsurface.bin</code></pre>
 в журнале будет отображаться это название вместо его модели.</p></div>
 </div>
 <div class="sect3">
-<h4 id="S_EditDiveInfo">5.2.3. Редактирование погружения, загруженного из компьютера</h4>
+<h4 id="S_EditDiveInfo">5.2.4. Редактирование погружения, загруженного из компьютера</h4>
 <div class="paragraph"><p>Информация из дайв-компьютера может быть неполной и вам потребуется ее
-отредактировать. Для этого вам предоставляется две вкладки <strong>Погружение</strong> и
+отредактировать. Для этого вам предоставляется две вкладки <strong>Примечания</strong> и
 <strong>Снаряжение</strong> в верхней левой панели <em>Subsurface</em>.</p></div>
-</div>
-<div class="sect3">
-<h4 id="_погружение_2">5.2.4. Погружение</h4>
+<div class="sect4">
+<h5 id="S_Notes_dc">Примечания</h5>
+<div class="paragraph"><p>Вам возможно придется указать дополнительную информацию, чтобы иметь более полную
+запись о погружении. Нижеописанная процедура одинакова как для погружений, введенных
+вручную, так и для загруженных из дайв-компьютера.</p></div>
 <div class="paragraph"><p>Дата и время погружения, газовая смесь и (обычно) температура присутствуют в
 импортированных дайвах, но вам может понадобиться дополнить
 информацию вручную. Если вы начнете менять какие-то данные на этой вкладке,
 сообщение на голубом фоне в верхней части окна будет уведомлять вас, что
-погружение редактируется. На вкладке <strong>Погружения</strong> вам доступны следующие поля
-для редактирования:</p></div>
+погружение редактируется.
+На вкладке <strong>Примечания</strong> вам доступны следующие поля
+для редактирования (картинка слева):</p></div>
 <div class="imageblock" style="text-align:center;">
 <div class="content">
-<img src="images/AddDive3_f20.jpg" alt="Рисунок: Вкладка Погружение" />
+<img src="images/AddDive3_f22.jpg" alt="Рисунок: Вкладка Примечания" />
 </div>
 </div>
-<div class="paragraph"><p>Поля <strong>Дата</strong> и <strong>Время</strong> соответствуют дате и времени дайва.  При нажатии мышкой
+<div class="paragraph"><p>На картинке справа показана заполненная вкладка <strong>Примечания</strong>.
+Поля <strong>Дата</strong> и <strong>Время</strong> соответствуют дате и времени дайва.  При нажатии мышкой
 на поле даты отображается выпадающий календарь, в котором можно выбрать
 необходимую дату.  Нажмите ESC чтобы закрыть календарь. Значение времени (часы
 и минуты) можно также непосредственно поменять, для чего необходимо нажать
@@ -1206,13 +1107,27 @@ subsurface.bin</code></pre>
 подставлены программой (единицы, выбранные в *Настройках* указывают будет ли
 использоваться метрическая или имперская система мер).</p></div>
 <div class="paragraph"><p><strong>Местоположение</strong>: В этом поле можно указать название дайв-сайта, например,
-«Эль-Мина рэк, Хургада, Египет». Если вы часто погружаетесь в одном месте,
-автодополнение поможет вам быстро ввести название сайта.</p></div>
-<div class="paragraph"><p><strong>Координаты</strong>: В этом поле можно указать географические координаты дайв-сайта. Их можно получить тремя способами:</p></div>
+«Эль-Мина рэк, Хургада, Египет». Управление дайв-сайтами осуществляется отдельно от ведения
+журнала. Если была указана информация для одного дайв-сайта, и у вас есть несколько погружений
+в этом же месте, то эта информация может быть использована без необходимости повторного ввода
+данных. Информация дайв-сайта может быть отредактирована в любой момент. Для этого выберите
+в списке любое погружение, выполнявшееся на этом сайте, и нажмите кнопку с изображением глобуса,
+которая находится справа от поля <strong>Местоположение</strong> (см. картинку справа выше). При вводе названия
+дайв-сайта <em>Subsurface</em> автоматически предложит вам список сайтов с похожими именами. Если сайт
+уже существует, выберите его из списка.</p></div>
+<div class="paragraph"><p>Если сайт ранее не существовал, вы увидите следующее сообщение (рисунок <strong>А</strong> ниже)</p></div>
+<div class="imageblock" style="text-align:center;">
+<div class="content">
+<img src="images/Locations1_f22.jpg" alt="FIGURE:Редактирование дайв-сайта" />
+</div>
+</div>
+<div class="paragraph"><p>Нажмите на иконку со знаком + справа. Вам будет представлена панель, на которой можно ввести
+координаты и прочую информацию о сайте (рисунок <strong>В</strong> выше). Наиболее важными являются географические
+координаты сайта. Их можно указать тремя способами:</p></div>
 <div class="paragraph"><p>а. Выбрать на карте, которая находится в правой нижней части окна
-<em>Subsurface</em>. На карте отображается зеленая полоса с надписью «Выберите место
+<em>Subsurface</em>. На карте отображается оранжевая полоса с надписью «Выберите место
 на карте двойным щелчком мыши». При двойном нажатии в соответствующем месте
-карты, зеленая полоса исчезнет и координаты точки будут заполнены в поле.</p></div>
+карты, оранжевая полоса исчезнет и координаты точки будут заполнены в поле.</p></div>
 <div class="paragraph"><p>б. Координаты могут быть получены с помощью вспомогательного приложения
 <em>Subsurface</em>, если у вас есть устройство Android с GPS-датчиком и координаты
 дайв-сайта были сохранены в этом устройстве.  <a href="#S_Companion">Нажмите, чтобы
@@ -1226,13 +1141,18 @@ subsurface.bin</code></pre>
 Градусы минуты секунды, например, Ю30° 13' 29.8" , В30° 49' 1.5"
 Десятичные градусы, например, 30.22496 , 30.821798</code></pre>
 </div></div>
-<div class="paragraph"><p>Широта южного полушария указывается с буквой <strong>Ю</strong>, например, Ю30°, или со
-знаком минус, например, -30.22496. Аналогично, долгота западного полушария
-указывается с буквой <strong>З</strong>, например, З07°, или со знаком минус, например,-7.34323.</p></div>
-<div class="paragraph"><p>Заметьте, что координаты GPS привязаны к названию дайв-сайта, поэтому
+<div class="paragraph"><p>Широта южного полушария указывается с буквой <strong>Ю</strong>, например, Ю30°, или со знаком минус,
+например, -30.22496. Аналогично, долгота западного полушария указывается с буквой <strong>З</strong>,
+например, З07°, или со знаком минус, например,-7.34323. На некоторых клавиатурах отсутствует
+символ градусов ((°). Его можно заменить на <strong>d</strong>, например: С30d З20d.</p></div>
+<div class="paragraph"><p><strong>Важно</strong> координаты GPS привязаны к названию дайв-сайта, поэтому
 указание координат для погружений, у которых не указано местоположение, может
 привести к непредсказуемым результатам (<em>Subsurface</em> будет предлагать, что все
 эти погружения были в одном месте и имеют одинаковые координаты).</p></div>
+<div class="paragraph"><p>Укажите прочую текстовую информацию о дайв-сайте (Описание и Примечания) и нажмите кнопку
+<em>Применить изменения</em>, чтобы сохранить информацию и сайте. В дальнейшем информация о сайте может
+быть отредактирована нажатием на кнопку с изображением глобуса справа от поля Местоположение на
+вкладке <strong>Примечания</strong>.</p></div>
 <div class="paragraph"><p><strong>Режим погружения</strong>: С помощью выпадающего списка вы можете выбрать режим погружения. Вам
 предоставляются следующие варианты: OC (открытый цикл, значение по умолчанию, подходит для большинства рекреационных дайверов),
 Freedive (погружение без дыхательного аппарата), CCR (ребризер замкнутого цикла) и pSCR (
@@ -1257,26 +1177,18 @@ Freedive (погружение без дыхательного аппарата)
 <div class="paragraph"><p><strong>Примечания</strong>: В это поле можно ввести любую дополнительную информацию.</p></div>
 <div class="paragraph"><p>Кнопка <strong>Применить изменения</strong> используются для сохранения информации на всех
 вкладках информационной панели и профиля погружения, поэтому нет необходимости
-<<<<<<< HEAD
-нажимать её до тех пор, пока вы не заполнили ВСЮ информацию. Ниже приведен
-=======
-нажимать ее до тех пор, пока вы не заполнили ВСЮ информацию. Ниже приведен
->>>>>>> v4.4-branch
-пример полностью заполненной информационной панели:</p></div>
-<div class="imageblock" style="text-align:center;">
-<div class="content">
-<img src="images/CompletedDiveInfo_f20.jpg" alt="Рисунок: Заполненная вкладка Погружение" />
-</div>
+нажимать ее до тех пор, пока вы не заполнили ВСЮ информацию. Картинка, помещенная
+<a href="#S_Notes_dc">в начале главы</a>, представляют пример полностью заполненной информационной панели.</p></div>
 </div>
 </div>
 <div class="sect3">
-<h4 id="_снаряжение_2">5.2.5. Снаряжение</h4>
+<h4 id="_снаряжение">5.2.5. Снаряжение</h4>
 <div class="paragraph"><p>Вкладка Снаряжение позволяет ввести информацию об используемых баллонах и
 газах, а также грузовых системах. Голубая полоса в верхней части панели с
 сообщением:</p></div>
 <div class="imageblock" style="text-align:center;">
 <div class="content">
-<img src="images/BlueEditBar_f20.jpg" alt="Голубая полоса редактирования" />
+<img src="images/BlueEditBar_f22.jpg" alt="Голубая полоса редактирования" />
 </div>
 </div>
 <div class="paragraph"><p>информирует о том, что в данный момент вы редактируете погружение. Эта часть
@@ -1447,11 +1359,7 @@ Organiser, мы рекомендуем сначала экспортироват
 Suunto Dive Manager и Shearwater. При импорте <em>Subsurface</em> пытается определить
 множественные записи относящиеся к одному погружению и объединить их. Если не
 обнаружено проблем (разница во временной зоне или значительная разница во времени),
-<<<<<<< HEAD
-<em>Subsurface</em> не создаcт дубликатов погружений.</p></div>
-=======
 <em>Subsurface</em> не создаст дубликатов погружений.</p></div>
->>>>>>> v4.4-branch
 </div>
 <div class="sect3">
 <h4 id="_использование_универсального_импорта">5.2.10. Использование универсального импорта</h4>
@@ -1473,6 +1381,11 @@ XML-файлы журналов ((Divinglog 5.0, MacDive и другие про
 </li>
 <li>
 <p>
+Журналы Cochran
+</p>
+</li>
+<li>
+<p>
 UDDF журналы (например, Kenozoooid)
 </p>
 </li>
@@ -1488,12 +1401,32 @@ UDCF журналы
 </li>
 <li>
 <p>
+Журналы APD Inspiration/Evolution CCR
+</p>
+</li>
+<li>
+<p>
+Журналы LiquiVision
+</p>
+</li>
+<li>
+<p>
+Журналы divelog.de
+</p>
+</li>
+<li>
+<p>
+Журналы OSTC Tools
+</p>
+</li>
+<li>
+<p>
 JDiveLog
 </p>
 </li>
 <li>
 <p>
-Suunnto Dive Manager (DM3 и DM4)
+Suunto Dive Manager (DM3 и DM4)
 </p>
 </li>
 <li>
@@ -1507,7 +1440,24 @@ CSV файлы (текстовые файлы и электронные табл
 импортировать другим способом, который описан ниже.</p></div>
 </div>
 <div class="sect3">
-<h4 id="_импорт_из_mares_dive_organiser_v2_1">5.2.11. Импорт из Mares Dive Organiser V2.1</h4>
+<h4 id="_импорт_из_ostc_tools">5.2.11. Импорт из OSTC Tools</h4>
+<div class="paragraph"><p><em>OSTC Tools</em> - набор программ для платформы Microsoft Windows для семейства дайв-компьютеров OSTC.
+, позволяющий загружать и организовывать погружения. <em>OSTC Tools</em> загружает данные погружений из
+дайв-компьютера и сохраняет их в файле с расширением <em>.dive</em>. Эти файлы могут быть загружены в
+<em>Subsurface</em> напрямую, используя диалог универсального импорта. В выпадающем списке в правой нижней
+части окна выберите <em>_Файлы OSTCTools (.dive .DIVE)</em>. Это действие отобразит файлы данного типа
+в панели выбора файлов. Выберите одно или несколько погружений и нажмите кнопку <em>Открыть</em>. Погружения
+будет отображены в <strong>Списке погружений</strong>.</p></div>
+<div class="paragraph"><p>Фактически, все устройства H&amp;W, поддерживаемые OSTCTools, могут быть импортированы в <em>Subsurface</em>.
+Этот список включает в себя OSTC, OSTC Mk2, OSTC 2N/2C, OSTC3, OSTC Sport и, возможно, непроверенные
+Frog, OSTC2 и OSTC CR.</p></div>
+<div class="paragraph"><p>Помните, однако, что OSTCTools <strong>не является</strong> полноценным журналом погружений, а только набором
+инструментов для анализа и управления дайв-компьютерами OSTC. Поэтому только данные непосредственно
+из дайв-компьютера могут быть импортированы в <em>Subsurface</em>; остальную информация (партнеры,
+снаряжение, и т.д.) вам придется внести вручную.</p></div>
+</div>
+<div class="sect3">
+<h4 id="_импорт_из_mares_dive_organiser_v2_1">5.2.12. Импорт из Mares Dive Organiser V2.1</h4>
 <div class="paragraph"><p>Так как Mares использует несвободное программное обеспечение для Microsoft,
 эти журналы не могут быть импортированы в <em>Subsurface</em> напрямую. Вместо этого
 вам придется выполнить процедуру, состоящую из трех шагов, и использовать
@@ -1536,7 +1486,7 @@ CSV файлы (текстовые файлы и электронные табл
 </ol></div>
 </div>
 <div class="sect3">
-<h4 id="S_ImportingDivelogsDe">5.2.12. Импорт с веб-сайта <strong>divelogs.de</strong></h4>
+<h4 id="S_ImportingDivelogsDe">5.2.13. Импорт с веб-сайта <strong>divelogs.de</strong></h4>
 <div class="paragraph"><p>Импорт журнала с сайта <em>divelogs.de</em> очень простой и использует одно
 диалоговое окно. Для начала в Главном меню выберите <em>Импорт &#8594; Импорт с сайта
 divelogs.de). В появившемся окне (рисунок <strong>А</strong> слева ниже) введите свои имя
@@ -1552,25 +1502,18 @@ divelogs.de). В появившемся окне (рисунок <strong>А</str
 </div>
 </div>
 <div class="sect3">
-<h4 id="S_ImportingCSVData">5.2.13. Импорт погружений в формате CSV</h4>
+<h4 id="S_ImportingCSVData">5.2.14. Импорт погружений в формате CSV</h4>
 <div class="paragraph"><p>Файл со значениями, разделенными запятой (.csv) может использоваться как для импорта
 профиля погружения (в случае ребризеров замкнутого цикла APD Inspiration и Evolution), так
-<<<<<<< HEAD
-и для загружки общей информации о дайвах (если вы вели учет в электронной таблице). CSV
-является универсальным и простым форматом для обмена данными между компьютерам и программами.
-Более подробно об этом формате рассказывается в главе <a href="#S_CSV_Intro">Формат CSV для дайверов</a>.
-<em>Subsurface</em> позволяет также выгружать журнал погужений для дальнейшей загрузки в другие программы.
-=======
 и для загрузки общей информации о дайвах (если вы вели учет в электронной таблице). CSV
 является универсальным и простым форматом для обмена данными между компьютерам и программами.
 Более подробно об этом формате рассказывается в главе <a href="#S_CSV_Intro">Формат CSV для дайверов</a>.
 <em>Subsurface</em> позволяет также выгружать журнал погружений для дальнейшей загрузки в другие программы.
->>>>>>> v4.4-branch
 Обратитесь к главе <a href="#S_Appendix_D">ПРИЛОЖЕНИЕ Г: Экспорт электронных таблиц в формат CSV</a>
 за информацией по загрузке данных из электронных таблиц в <em>Subsurface</em>.</p></div>
 </div>
 <div class="sect3">
-<h4 id="S_ImportingCSVDives">5.2.14. Импорт погружений в CSV-формате из дайв-компьютеров и других программ</h4>
+<h4 id="S_ImportingCSVDives">5.2.15. Импорт погружений в CSV-формате из дайв-компьютеров и других программ</h4>
 <div class="paragraph"><p>Для просмотре и редактирования CSV-файлов подойдет обычный текстовый редактор.
 Данные в CSV-файле обычно организованы следующим образом: одна строка
 заголовка и затем строки данных, по одной на каждую запись.</p></div>
@@ -1578,11 +1521,7 @@ divelogs.de). В появившемся окне (рисунок <strong>А</str
 <div class="olist arabic"><ol class="arabic">
 <li>
 <p>
-<<<<<<< HEAD
-<em>Общая информация о погружении</em>: в этом случае файл содержит обучную для журнала информацию,
-=======
 <em>Общая информация о погружении</em>: в этом случае файл содержит обычную для журнала информацию,
->>>>>>> v4.4-branch
    например, дату и время, глубину, длительность, имена партнеров и дайв-мастера, возможно
    данные об баллонах и давлении до и после погружения, примечания. Все данные для одного
    погружения хранятся в одной строке, а порядке определенном в заголовке.
@@ -1599,11 +1538,7 @@ divelogs.de). В появившемся окне (рисунок <strong>А</str
 </p>
 </li>
 </ol></div>
-<<<<<<< HEAD
-<div class="paragraph"><p>Перед импортом CSV-файла в <em>Subsurface</em> вам <strong>необходимо выяснить некоторые свойсвтва этого
-=======
 <div class="paragraph"><p>Перед импортом CSV-файла в <em>Subsurface</em> вам <strong>необходимо выяснить некоторые свойства этого
->>>>>>> v4.4-branch
 файла</strong>:</p></div>
 <div class="paragraph"><p>а. Какой символ служит разделителем колонок в одной строке данных? Этот символ должен быть
    запятой (,) или табуляцией? Вы можете определить это, открыв файл в текстовом редакторе.
@@ -1624,22 +1559,14 @@ divelogs.de). В появившемся окне (рисунок <strong>А</str
 <img src="images/csv_import1_f20.jpg" alt="Рисунок: Диалог 1 импорт CSV" />
 </div>
 </div>
-<<<<<<< HEAD
-<div class="paragraph"><p>Обратите внимение на выпадающий список в левом верхнем углу. Он содержит настройки для
-=======
 <div class="paragraph"><p>Обратите внимание на выпадающий список в левом верхнем углу. Он содержит настройки для
->>>>>>> v4.4-branch
 часто встречающихся дайв-компьютеров и программ. Если ваш CSV-файл есть в этом списке,
 используйте его. В противном случае следует выбрать <em>Импорт вручную</em>. В окне конфигурации
 также есть выпадающие список для указания символа-разделителя, формата даты и длительности
 погружения, а также используемой системы мер. Для успешного импорта очень важно задать
 правильные значения в этих списках.</p></div>
 <div class="paragraph"><p>На последнем шаге вы должны сопоставить поля данных в файле их названиям. Первая белая
-<<<<<<< HEAD
-строка таблицы данных содержит заголоки, найденные в CSV-файле. Голубая строка таблицы,
-=======
 строка таблицы данных содержит заголовки, найденные в CSV-файле. Голубая строка таблицы,
->>>>>>> v4.4-branch
 находящаяся непосредственно на ней, содержит названия <em>Subsurface</em>. В белой области,
 находящейся сразу под выпадающими списками, представлены поля-метки, которые могут быть
 импортированы в <em>Subsurface</em>. Эти метки, заключенные в овалы голубого цвета, необходимо
@@ -1663,13 +1590,8 @@ divelogs.de). В появившемся окне (рисунок <strong>А</str
 <td class="icon">
 <img src="images/icons/important.png" alt="Важно" />
 </td>
-<<<<<<< HEAD
-<td class="content">Аббревиатура <em>CSV</em> происходит от английского <em>Comma-Separated Variables</em>, что означает
-<em>зачения, разделенные запятой</em>. Файлы этого формата можно отредактировать с помощь текстового
-=======
 <td class="content">Аббревиатура <em>CSV</em> происходит от английского <em>Comma-Separated Values</em>, что означает
 <em>значения, разделенные запятой</em>. Файлы этого формата можно отредактировать с помощь текстового
->>>>>>> v4.4-branch
 редактора, например Notepad (Windows), gedit (Linux) или TextWrangler(OS/X). Преимущества
 этого формата заключаются в том, что а) для его редактирования не нужно никакого специализированного
 программного обеспечения, и б) в нем нет ничего лишнего и он может легко быть
@@ -1738,11 +1660,7 @@ Pulau Weh       2012-12-20      09:46   55:56   38.6    Karaeng Bontonompo</code
 Файл должен быть сохранен в кодировке UTF-8, если вы используете символы отличные от латинских.
 Размер файла также может быть причиной определенных проблем. Импорт 100 погружений за раз
 (<em>Общая информация о погружениях_) вряд ли будет проблемой, но файлы большего размера могут.
-<<<<<<< HEAD
-При возникновении проблем с _Импортом CSV</em> попробуйте для начала уменьшить развер файла.</td>
-=======
 При возникновении проблем с _Импортом CSV</em> попробуйте для начала уменьшить размер файла.</td>
->>>>>>> v4.4-branch
 </tr></table>
 </div>
 </div>
@@ -1834,7 +1752,7 @@ Pulau Weh       2012-12-20      09:46   55:56   38.6    Karaeng Bontonompo</code
   нажатием на сенсорном экране. Если место выбрано неправильно, выберите
   другое, после чего нажмите на галочку в правом верхнем углу экрана. Укажите
   название точки и дату и время погружения (рисунок <strong>С</strong>). Для корректного
-  импорта местоположения в <em>Subsurfce</em> мы рекомендуем, чтобы время совпадало
+  импорта местоположения в <em>Subsurface</em> мы рекомендуем, чтобы время совпадало
   со временем дайва.
 </p>
 </li>
@@ -2000,9 +1918,8 @@ Pulau Weh       2012-12-20      09:46   55:56   38.6    Karaeng Bontonompo</code
 <div class="ulist"><ul>
 <li>
 <p>
-<em>Синхронизация при старте</em>. Если выбран этот параметр, при каждом старте
-приложения погружения на вашем Android-устройстве и веб-сервисе будут
-синхронизироваться.
+<em>Синхронизация при старте</em>. Если выбран этот параметр, при каждом старте приложения погружения
+на вашем Android-устройстве и веб-сервисе будут синхронизироваться.
 </p>
 </li>
 <li>
@@ -2046,36 +1963,21 @@ Pulau Weh       2012-12-20      09:46   55:56   38.6    Karaeng Bontonompo</code
 ниже), после чего можно приступать к сбору информации о местоположении погружений.</p></div>
 <div class="imageblock" style="text-align:center;">
 <div class="content">
-<<<<<<< HEAD
-<img src="images/iphone.jpg" alt="FIGURE: Using iPhone companion application" width="640" />
-</div>
-</div>
-<div class="paragraph"><p>Погружения могут быть добавлены автоматически или вручную. В ручном редиме, служба получения
-=======
-<img src="images/iphone.jpg" alt="Рисунок: Использоване вспомогательного приложения на iPhone" width="640" />
+<img src="images/iphone.jpg" alt="Рисунок: Использование вспомогательного приложения на iPhone" width="640" />
 </div>
 </div>
 <div class="paragraph"><p>Погружения могут быть добавлены автоматически или вручную. В ручном режиме, служба получения
->>>>>>> v4.4-branch
 координат запускается автоматически, а в нижней части экрана появляется красная полоса. После
 завершения погружения вам нужно нажать на красной области, чтобы остановить службу
 позиционирования. При запущенной службе позиционирования вы можете добавлять погружения
 только в ручном режиме.</p></div>
-<<<<<<< HEAD
-<div class="paragraph"><p>Позже вы можете отредактирование название месте погружения, выбрав и нажав на него в списке.
-=======
 <div class="paragraph"><p>Позже вы можете отредактировать название места погружения, выбрав и нажав на него в списке.
->>>>>>> v4.4-branch
 Другие поля для редактирования недоступны. Список дайвов автоматически выгружается на сервер,
 возможно вручную синхронизировать погружения отсутствует.</p></div>
 </div>
 <div class="sect3">
 <h4 id="_загрузка_координат_погружений_в_журнал_em_subsurface_em">5.3.6. Загрузка координат погружений в журнал <em>Subsurface</em></h4>
-<<<<<<< HEAD
-<div class="paragraph"><p>Перед получением GPS-кородинат с сервера, погружения должны быть загружены в
-=======
 <div class="paragraph"><p>Перед получением GPS-координат с сервера, погружения должны быть загружены в
->>>>>>> v4.4-branch
 журнал из дайв-компьютера или введены вручную. Для загрузки координат выберите
 в главном меню <em>Импорт &#8594; Импорт координат</em> или нажмите комбинацию клавиш
 Ctrl-G. Вам будет представлено окно, как показано на рисунке <strong>А</strong> ниже. При
@@ -2199,18 +2101,11 @@ Ctrl-G. Вам будет представлено окно, как показа
 </li>
 </ul></div>
 <div class="paragraph"><p>Если фотография была сделана задолго до или после погружения, она не будет
-показываться на профиле. <em>Subsurface</em> допускает интервал равный 30 минутам.</p></div>
+показываться на профиле. <em>Subsurface</em> допускает интервал равный 30 минутам до и после погружения.</p></div>
 </div>
 <div class="sect3">
 <h4 id="_просмотр_фотографий">5.4.2. Просмотр фотографий</h4>
-<div class="paragraph"><p>Для просмотра добавленных фотографий на профиле погружений, активируйте
-переключатель <em>Фотографии</em> на панели слева от профиля погружения:</p></div>
-<div class="imageblock" style="text-align:left;">
-<div class="content">
-<img src="images/icons/ShowPhotos_f20.png" alt="Рисунок: Переключатель Фотографии" />
-</div>
-</div>
-<div class="paragraph"><p>После загрузки фотографии отображаются</p></div>
+<div class="paragraph"><p>После загрузки фотографии отображаются:</p></div>
 <div class="ulist"><ul>
 <li>
 <p>
@@ -2221,9 +2116,17 @@ Ctrl-G. Вам будет представлено окно, как показа
 <p>
 в виде маленьких иконок на профиле погружения в соответствии
    со временем фото:
+   Для просмотра добавленных фотографий на профиле погружений, активируйте
+   переключатель <em>Фотографии</em> на панели слева от профиля погружения:
 </p>
 </li>
 </ul></div>
+<div class="imageblock" style="text-align:left;">
+<div class="content">
+<img src="images/icons/ShowPhotos_f20.png" alt="Рисунок: Переключатель Фотографии" />
+</div>
+</div>
+<div class="paragraph"><p>Профиль погружения при этом будет выглядеть следующим образом:</p></div>
 <div class="imageblock" style="text-align:center;">
 <div class="content">
 <img src="images/LoadImage4_f20.jpg" alt="Рисунок: Фотографии на профиле" />
@@ -2239,17 +2142,9 @@ Ctrl-G. Вам будет представлено окно, как показа
 <div class="paragraph"><p>Обратите внимание, что в левом верхнем углу миниатюры есть изображение
 мусорной корзины, при нажатии на которое картинка будет удалена. Поэтому
 будьте внимательны, кожа щелкаете мышкой на картинке. При нажатии мышкой на
-миниатюрное фото (в профиле или на вкладке _Фотографии), полноразмерная
-фотография откроется во внешней программе для просмотра изображений:</p></div>
-<<<<<<< HEAD
-<div class="paragraph"><p>image::ima
-ges/LoadImage6_f20.jpg["Рисунок: Просмотр полноразмерных фотографий",align="center"]</p></div>
-</div>
-<div class="sect3">
-<h4 id="_вкладка_em_фотографии_em">5.4.3. Вкладка <em>Фотографии</em></h4>
-<div class="paragraph"><p>Фотографии, добавленные к погружению, отображаются миниатюными картинками на
-вкладке <em>Фотографии</em> в <em>Информационной ппнели</em>. Снимки, сделанные в серии и
-=======
+миниатюрное фото (в профиле или на вкладке <em>Фотографии), полноразмерная
+фотография откроется во внешней программе для просмотра изображений. Фотографии также могут
+быть удалены на вкладке _Фотографии</em> (см. ниже).</p></div>
 <div class="imageblock" style="text-align:center;">
 <div class="content">
 <img src="images/LoadImage6_f20.jpg" alt="Рисунок: Просмотр полноразмерных фотографий" />
@@ -2260,24 +2155,17 @@ ges/LoadImage6_f20.jpg["Рисунок: Просмотр полноразмер
 <h4 id="_вкладка_em_фотографии_em">5.4.3. Вкладка <em>Фотографии</em></h4>
 <div class="paragraph"><p>Фотографии, добавленные к погружению, отображаются миниатюрными картинками на
 вкладке <em>Фотографии</em> в <em>Информационной панели</em>. Снимки, сделанные в серии и
->>>>>>> v4.4-branch
 имеющие короткий временной интервал, могут перекрывать друг друга на профиле,
 но легко различимы на этой вкладке. Одиночный щелчок мышью на фотографии
 выделяет ее, двойной щелчок мышью открывает окно просмотра фото во внешней
 программе. Фотографию можно удалить на вкладке <em>Фотографии</em>, выбрав ее щелчком
-мыши и нажатием клавиши <em>Del</em>.</p></div>
+мыши и нажатием клавиши <em>Del</em> (фотография будет удалена и из профиля).</p></div>
 </div>
 <div class="sect3">
 <h4 id="_фотографии_на_внешнем_жестком_диске">5.4.4. Фотографии на внешнем жестком диске</h4>
-<<<<<<< HEAD
-<div class="paragraph"><p>Многие фотографы хранят свои снимки на внешнем накопителе. Если внещний диск
-подключен, то <em>Subsurface</em> в большинстве случаев увидит его, и таким образом
-будет обеспечен доступ к внешнему хранилищу фотографий. При этом вы добавлете
-=======
 <div class="paragraph"><p>Многие фотографы хранят свои снимки на внешнем накопителе. Если внешний диск
 подключен, то <em>Subsurface</em> в большинстве случаев увидит его, и таким образом
 будет обеспечен доступ к внешнему хранилищу фотографий. При этом вы добавляете
->>>>>>> v4.4-branch
 фото с внешнего диска так, как описан выше. Однако после того, как внешний
 накопитель отключен, у <em>Subsurface</em> не будет доступа к фотографиям. Если на
 панели кнопок-переключателей (слева от профиля) нажата кнопка <em>Миниатюры
@@ -2285,15 +2173,68 @@ ges/LoadImage6_f20.jpg["Рисунок: Просмотр полноразмер
 вкладке <em>Фотографии</em> только имена файлов вместо миниатюр. После подключения
 внешнего накопителя вы снова сможете увидеть фотографии.</p></div>
 </div>
+<div class="sect3">
+<h4 id="S_FindMovedImages">5.4.5. Перенос фотографий между директориями, жесткими дисками и компьютерами</h4>
+<div class="paragraph"><p>После загрузки фотографии в <em>Subsurface</em> и ее привязки к погружению, папка, в
+которой она находится, запоминается с тем, чтобы найти фото в следующий раз,
+когда вы откроете погружение. Если фотография или вся коллекция переносится на
+другой жесткий диск или компьютер, маловероятно что структура каталогов будет
+такой же, как до переноса. <em>Subsurface</em> попытается загрузить фотографии из их
+начального местоположения и не сможет их найти. Вместо того, чтобы удалять все
+фотографии и загружать их заново, <em>Subsurface</em> предлагает механизм, который значительно
+упрощает процесс обновления местоположения фотографий: обновление с помощью "отпечатков".</p></div>
+<div class="paragraph"><p>Когда фотография загружается в <em>Subsurface</em>, для нее вычисляется цифровой отпечаток, который
+сохраняется наряду с прочей информацией о фотографии. После переноса фото-коллекции (которая уже
+была загружена в <em>Subsurface</em>) в другую папку, диск или компьютер, <em>Subsurface</em> может выполнить
+следующие шаги:</p></div>
+<div class="ulist"><ul>
+<li>
+<p>
+рекурсивно просканировать указанную папку и вложенные поддиректории, куда фотографии были
+  перенесены,
+</p>
+</li>
+<li>
+<p>
+вычислить отпечатки для всех найденных фотографий и
+</p>
+</li>
+<li>
+<p>
+если найдено соответствие между новым отпечатком и оригинальным, вычисленным при начальной
+  загрузке фотографии (даже если имена файлов изменились), то информация о новом местоположении
+  будет автоматически обновлена, с тем чтобы <em>Subsurface</em> мог найти ее в новой директории.
+</p>
+</li>
+</ul></div>
+<div class="paragraph"><p>Это можно сделать, выбрав в <strong>Главном меню</strong> пункт <em>Файл &#8594; Найти перемещенные фото</em>. Вам будет
+предложено выбрать папку, куда были перенесены фотографии. Выберите директорию и нажмите кнопку
+<em>Сканировать</em>. Этот процесс может занять несколько минут, после чего сможет отобразить фотографии
+для выбранного погружения.</p></div>
+<div class="sidebarblock" id="Image_fingerprint_upgrade">
+<div class="content">
+<div class="paragraph"><p><strong>Обновления существующих коллекций фотографий без отпечатков</strong></p></div>
+<div class="admonitionblock">
+<table><tr>
+<td class="icon">
+<img src="images/icons/important.png" alt="Важно" />
+</td>
+<td class="content">Функциональность по автоматическому вычислению отпечатков для существующих коллекций все еще
+находится в разработке. В настоящий момент вам придется обновлять по одному погружению за раз.
+На панели <strong>Профиля погружения</strong> нажмите кнопку, которая отвечает за отображение фотографий. На
+профиле должны отобразиться миниатюры фотографий. Выберите погружение и измените что-нибудь на
+вкладке <strong>Примечания</strong>, что приведет к переходу в режим редактирования, о чем свидетельствует
+голубая полоса в верхней части. Например, вы можете добавить пробел в конец поля <em>Примечания</em> и
+тут же удалить его. Нажмите на кнопку <em>Применить изменения</em>, чтобы сохранить погружение.
+Отпечатки фотографий вычисляются при сохранении выбранного погружения.</td>
+</tr></table>
+</div>
+</div></div>
+</div>
 </div>
 <div class="sect2">
 <h3 id="_ведение_журнала_для_специальных_типов_погружений">5.5. Ведение журнала для специальных типов погружений</h3>
 <div class="sect3">
-<<<<<<< HEAD
-<h4 id="_погружения_в_конфигурации_side_mount">5.5.1. Погружения в конфигурации side-mount</h4>
-<div class="paragraph"><p><em>Subsurface</em> легко справляется с многобаллонными погружениями. Ведение журнала сайд-маунт
-погружение заключается в трех шагах:</p></div>
-=======
 <h4 id="S_MulticylinderDives">5.5.1. Погружения с несколькими баллонами</h4>
 <div class="paragraph"><p><em>Subsurface</em> позволяет без проблем вести учет многобаллонных погружений. Такие погружения обычно
 выполняются если (а) не хватает воздуха для совершения погружения на одном баллоне; (б) нужно более
@@ -2341,7 +2282,6 @@ ges/LoadImage6_f20.jpg["Рисунок: Просмотр полноразмер
 Хотя эта конфигурация наиболее популяра среди пещерных дайвером, она может использоваться и для
 рекреационных погружений после соответствующей подготовки. Как и в случае многобаллонных погружений,
 для учета таких погружений необходимо выполнить три шага:</p></div>
->>>>>>> v4.4-branch
 <div class="ulist"><ul>
 <li>
 <p>
@@ -2358,7 +2298,7 @@ ges/LoadImage6_f20.jpg["Рисунок: Просмотр полноразмер
 <li>
 <p>
 <strong>Укажите конфигурацию баллонов</strong> на вкладке <strong>Снаряжение</strong> (см. рисунок ниже, на котором
-  добавдено два 12-литровых баллона).
+  добавлено два 12-литровых баллона).
 </p>
 </li>
 <li>
@@ -2384,9 +2324,6 @@ ges/LoadImage6_f20.jpg["Рисунок: Просмотр полноразмер
 <div class="paragraph"><p>Эта глава демонстрирует гибкость <em>Subsurface</em> при ведении журналов погружений.</p></div>
 </div>
 <div class="sect3">
-<<<<<<< HEAD
-<h4 id="S_CCR_dives">5.5.2. Погружения с ребризером закрытого цикла (CCR)</h4>
-=======
 <h4 id="S_sSCR_dives">5.5.3. Погружения с ребризером полузамкнутого цикла (SCR)</h4>
 <div class="admonitionblock">
 <table><tr>
@@ -2428,18 +2365,13 @@ ges/LoadImage6_f20.jpg["Рисунок: Просмотр полноразмер
 </div>
 <div class="sect3">
 <h4 id="S_CCR_dives">5.5.4. Погружения с ребризером закрытого цикла (CCR)</h4>
->>>>>>> v4.4-branch
 <div class="admonitionblock">
 <table><tr>
 <td class="icon">
 <img src="images/APD.jpg" alt="Замечание" />
 </td>
 <td class="content">Ребризеры замкнутого цикла используют передовые технологии для рециркуляции отработанного газа,
-<<<<<<< HEAD
-выполняя две фукнции для поддержания концентрации кислорода, делая смест пригодной для дыхания:
-=======
 выполняя две функции для поддержания концентрации кислорода, делая смест пригодной для дыхания:
->>>>>>> v4.4-branch
 а) удаление углекислого газа из выдыхаемого воздуха
 б) поддержание концентрации кислорода в безопасных пределах.
 На текущий момент <em>Subsurface</em> обеспечивает наилучшую поддержку CCR дайв-компьютера Poseidon
@@ -2453,40 +2385,29 @@ CCR не позволяют загружать журналы нескольки
 </div>
 <div class="sect4">
 <h5 id="_импорт_погружения_с_ребризером_закрытого_цикла">Импорт погружения с ребризером закрытого цикла</h5>
-<div class="paragraph"><p>Прочитайте главу <a href="#S_ImportingAlienDiveLogs">Импорт погружений из других цифровых источников</a>.
-В главном меню <em>Subsurface</em> выберите <em>Импорт &#8594; Импорт журналов</em> чтобы открыть окно
-<a href="#Unified_import">Универсальный импорт</a>. Как описано в этой главе, в правой нижней части окна
-находится список поддерживаемых источников, среди которых есть и файлы (Poseidon) MkVI (поддержка
-другого CCR-оборудование активно развивается). Выбрав нужный формат и директорию с файлами-журналами,
-вам нужно выбрать конкретный журнал погружения (в случае MkVI это один файл с расширением .txt).
-После выбора файла нажмите на кнопку <em>Открыть</em>.</p></div>
+<div class="paragraph"><p>Прочитайте главу <a href="#S_ImportingAlienDiveLogs">Импорт погружений из других
+цифровых источников</a>.  В главном меню <em>Subsurface</em> выберите <em>Импорт &#8594; Импорт
+журналов</em> чтобы открыть окно <a href="#Unified_import">Универсальный импорт</a>. Как
+описано в этой главе, в правой нижней части окна находится список
+поддерживаемых источников, среди которых есть и файлы (Poseidon) MkVI
+(поддержка другого CCR-оборудование активно развивается). Выбрав нужный формат
+и директорию с файлами-журналами, вам нужно выбрать конкретный журнал
+погружения (в случае MkVI это один файл с расширением .txt).  После выбора
+файла нажмите на кнопку <em>Открыть</em>.</p></div>
 </div>
 </div>
 <div class="sect3">
-<<<<<<< HEAD
-<h4 id="_информация_отображаемая_для_ccr_погружений">5.5.3. Информация, отображаемая для CCR-погружений</h4>
-<div class="paragraph"><p><em>Парциальные давления газов</em>: График парциального давления кислорода показывает информацию с
-кислородных датчиков ребризера. В отличие от рекреационного режима, где значения pO<sub>2</sub> высчитываются
-исходя из состава смеси и глубины, для CCR-погружений эти значения берутся от датчиков. В этом случае
-график должнен быть достаточно ровным, соответствую значению установки (set-point). Среднее значение
-pO<sub>2</sub> не является средним значением, рапортуемым датчиком, а расчитано <em>Subsurface</em> следующим
-=======
 <h4 id="_информация_отображаемая_для_ccr_погружений">5.5.5. Информация, отображаемая для CCR-погружений</h4>
 <div class="paragraph"><p><em>Парциальные давления газов</em>: График парциального давления кислорода показывает информацию с
 кислородных датчиков ребризера. В отличие от рекреационного режима, где значения pO<sub>2</sub> высчитываются
 исходя из состава смеси и глубины, для CCR-погружений эти значения берутся от датчиков. В этом случае
 график должен быть достаточно ровным, соответствуя значению установки кислорода (set-point). Среднее значение
 pO<sub>2</sub> не является средним значением от датчика, а рассчитано <em>Subsurface</em> следующим
->>>>>>> v4.4-branch
 образом:</p></div>
 <div class="ulist"><ul>
 <li>
 <p>
-<<<<<<< HEAD
-для двух датчиков O<sub>2</sub> расчитывается среднее значение.
-=======
 для двух датчиков O<sub>2</sub> рассчитывается среднее значение.
->>>>>>> v4.4-branch
 </p>
 </li>
 <li>
@@ -2502,11 +2423,7 @@ pO<sub>2</sub> не является средним значением от да
 </p>
 </li>
 </ul></div>
-<<<<<<< HEAD
-<div class="paragraph"><p>Среднее значание pO<sub>2</sub> сенсоров отображается зеленой линией.</p></div>
-=======
 <div class="paragraph"><p>Среднее значение pO<sub>2</sub> сенсоров отображается зеленой линией.</p></div>
->>>>>>> v4.4-branch
 <div class="paragraph"><p>Значения установок кислорода, а также показания индивидуальных датчиков, могут быть показаны  на
 профиле. Отображение расширенной информации для CCR-погружения регулируется в <em>Настройках_ (доступны
 в <a href="#S_CCR_options">_Файл &#8594; Настройки &#8594; Профиль</em></a>. Вот настройки, влияющие на отображение pO<sub>2</sub>
@@ -2543,11 +2460,7 @@ pO<sub>2</sub> не является средним значением от да
 </p>
 </li>
 </ul></div>
-<<<<<<< HEAD
-<div class="paragraph"><p>Среднее значение pO<sub>2</sub> показвается зеленым цветом. Такое отображение позволяет непосредственно
-=======
 <div class="paragraph"><p>Среднее значение pO<sub>2</sub> показывается зеленым цветом. Такое отображение позволяет непосредственно
->>>>>>> v4.4-branch
 сравнить данные от каждого сенсора и выявить странно низкие или абсолютно неверные показания.</p></div>
 <div class="imageblock" style="text-align:center;">
 <div class="content">
@@ -2558,15 +2471,6 @@ pO<sub>2</sub> не является средним значением от да
 галочки напротив обоих параметров. Парциальные давления азота (и гелия, если применимо) отображаются
 так же, как для погружения на открытом цикле.</p></div>
 <div class="paragraph"><p><em>События</em>: в случае погружений с ребризером могут быть записаны дополнительные события, например,
-<<<<<<< HEAD
-перевод загубника в режим открытого цикла. Такие события отображаются на профиле в виде жетых
-треуголников. При наведении на него указателя мыши, в <a href="#S_InfoBox">плавающем информационном окне</a>
-показывается описание события.</p></div>
-<div class="paragraph"><p><em>Давление в баллонах_: некоторые CCR дайв-компьютеры (например, Poseidon MkVI) сохраняют информацию
-о давлении в баллонах с кислородом и дилуентом. График давлений в этих баллонах отображается
-зелеными линиями поверх профиля глубины. В дополнение к этому, информация о начальном и конечном
-давлениях в баллонах с дилуентом и кислородом показывается на вкладке _Снаряжение</em>.
-=======
 перевод загубника в режим открытого цикла. Такие события отображаются на профиле в виде желтых
 треугольников. При наведении на него указателя мыши, в <a href="#S_InfoBox">плавающем информационном окне</a>
 показывается описание события.</p></div>
@@ -2574,7 +2478,6 @@ pO<sub>2</sub> не является средним значением от да
 о давлении в баллонах с кислородом и дилуентом. График давлений в этих баллонах отображается
 зелеными линиями поверх профиля глубины. В дополнение к этому, информация о начальном и конечном
 давлениях в баллонах с дилуентом и кислородом показывается на вкладке <em>Снаряжение</em>.
->>>>>>> v4.4-branch
 Ниже представлен профиль CCR-погружения, на котором показаны графики значений установки, сенсоров и
 давлений в баллонах. В этом случае мы видим согласованность показаний двух сенсоров.</p></div>
 <div class="imageblock" style="text-align:center;">
@@ -2585,11 +2488,25 @@ pO<sub>2</sub> не является средним значением от да
 <div class="paragraph"><p><em>Дополнительная информация</em>: Информация, специфичная для конкретного оборудования, отображается в
 <em>Subsurface</em> на вкладке <a href="#S_ExtraDataTab">Дополнительная информация</a>. Она может включать настройки
 оборудования и прочие данные.</p></div>
-<<<<<<< HEAD
-<div class="paragraph"><p>За более детальной информацией по загружке погружений из ребризеров Poseidon MkVI и APD обратитесь
-=======
+<div class="paragraph"><p>Деко-потолок, вычисленный <em>Subsurface</em>, не всегда точен, потому что зачастую невозможно узнать
+точное парциальное давление азота в цикле из журнала, импортированного из ребризера. Однако, многие
+дайв-компьютеры, поддерживающие ребризеры, сообщают информацию о своем вычисленном деко-потолке в
+журнале, и это значение может быть более точным. Для отображения этого потолка необходимо активировать
+соответствующую кнопку на панели слева от профиля погружения?</p></div>
+<div class="imageblock">
+<div class="content">
+<img src="images/icons/cceiling.jpg" alt="Кнопка отображения потолка дайв-компьютера" />
+</div>
+</div>
+<div class="paragraph"><p>По умолчанию потолок дайв-компьютера отображается на профиле погружения белым цветом. Вы можете
+отобразить его красным, выбрав соответствующий параметр в <em>Файл &#8594; Настройки &#8594; Профиль</em>. Ниже
+показан профиль погружения с отображенным потолком дайв-компьютера:</p></div>
+<div class="imageblock" style="text-align:center;">
+<div class="content">
+<img src="images/CCR_dive_ceilingF22.jpg" alt="Рисунок: Деко-потолок дайв-компьютера" />
+</div>
+</div>
 <div class="paragraph"><p>За более детальной информацией по загрузке погружений из ребризеров Poseidon MkVI и APD обратитесь
->>>>>>> v4.4-branch
 к <a href="#S_PoseidonMkVI">ПРИЛОЖЕНИЮ Б</a>.</p></div>
 </div>
 </div>
@@ -2619,17 +2536,10 @@ pO<sub>2</sub> не является средним значением от да
 </div>
 <div class="sect2">
 <h3 id="S_ExtraDataTab">6.2. Вкладка <strong>Дополнительно</strong> (обычно для индивидуального погружения)</h3>
-<<<<<<< HEAD
-<div class="paragraph"><p>При использовании дайв-компьютера он обычно сообщает дополнительную информацию, которуб невозможно
-отобразить единообразным образом, принимая во внимание, что эта информация различается для разных
-моделей. Обычно эта информация включает в себя настройки компьютера, уровень заряда батареи,
-бесполетное время или установки градиент-фактора. Когда доступны, эти данные отображаются на вкладке
-=======
 <div class="paragraph"><p>При использовании дайв-компьютера он обычно сообщает дополнительную информацию, которую невозможно
 отобразить единообразным образом, принимая во внимание, что эта информация различается для разных
 моделей. Обычно эта информация включает в себя настройки компьютера, уровень заряда батареи,
 неполетное время или установки градиент-фактора. Когда доступны, эти данные отображаются на вкладке
->>>>>>> v4.4-branch
 <strong>Дополнительно</strong>. На рисунке ниже приведены дополнительные данные для погружение на ребризере Poseidon.</p></div>
 <div class="imageblock" style="text-align:center;">
 <div class="content">
@@ -2768,8 +2678,8 @@ cellspacing="0" cellpadding="4">
 </div>
 <div class="paragraph"><p>Вы можете менять масштаб профиля с помощью колеса мыши или соответствующего
 жеста на сенсорной панели. По умолчанию <em>Subsurface</em> масштабирует панель
-профиля, так чтобы помещалось 30-минутное погружение на 30 метров. Понятно,
-что для фридайверов это не имеет смысла.</p></div>
+профиля, так чтобы помещалось 30-минутное погружение на 30 метров. Очевидно,
+что для фридайверов это не актуально.</p></div>
 <div class="imageblock" style="text-align:center;">
 <div class="content">
 <img src="images/MeasuringBar.png" alt="Рисунок: Рулетка" />
@@ -2816,7 +2726,7 @@ cellspacing="0" cellpadding="4">
 время дайва (представлен <span class="green">темно-зеленой</span> областью на профиле в начале
 этой главы). Это вызвано тем, что <em>Subsurface</em> рассчитывает деко-обязательства
 в каждый момент погружения, в то время, как дайв-компьютеры обычно принимают
-во внимание и время всплытия. Во время всплытия происходит расыщение азота (и
+во внимание и время всплытия. Во время всплытия происходит рассыщение азота (и
 возможно гелия), поэтому даже технически "заработав" потолок на дне,
 обязательная деко-остановка не требуется. Это позволяет дайв-компьютерам
 рассчитывать большее время на дне.</p></div>
@@ -2869,20 +2779,15 @@ cellspacing="0" cellpadding="4">
 <img src="images/icons/ShowCylindersButton.jpg" alt="Замечание" />
 </td>
 <td class="content">Если выбран этот переключатель, то баллоны, используемые в погружении, отображаются в виде цветной
-<<<<<<< HEAD
-полосы в нижней части профиля погружения. Кодировка цветов следующая: кислород отрисовывается
-зеленой полосой, азот желтой, а гелий - красной. Рисунк ниже представлят профиль погружения с первой
-=======
 полосы в нижней части профиля погружения. Кодировка цветов следующая: кислород нарисован
 зеленой полосой, азот желтой, а гелий - красной. Рисунок ниже представляет профиль погружения с первой
->>>>>>> v4.4-branch
 смесью Trimix (красно-зеленая полоса), с дальнейшим переходом на Nitrox (желто-зеленая полоса) на 23
 минуте. Баллоны с воздухом представлены светло-голубой полосой.</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" />
+<img src="images/ShowCylinders_f20.jpg" alt="Рисунок: График использования баллонов" />
 </div>
 </div>
 <div class="admonitionblock">
@@ -2893,21 +2798,12 @@ cellspacing="0" cellpadding="4">
 <td class="content">Показывает давление инертных газов в тканях относительно внешнего давления (горизонтальная серая
 линия). Давление в тканях рассчитывается по алгоритму Бюльмана ZH-L16 и отображается линиями, цвет
 которых варьируется от зеленого (самые быстрые ткани) до синего (самые медленные ткани).
-<<<<<<< HEAD
-Черная линия, отрисованная выше графика внешнего давления, показывает максимальное допустимое
-перенасыщение согласно значений градиент-фактора, указанных в <strong>Настройках*. Для дайверов, планирующих
-декомпрессионные погружения, эффективное скорость рассыщения достигается при давлении в тканях
-большем чем окружаещее давление (серая линия), но меньшем чем предельное (черная линия). Это
-представление отображает давление в тканях на протяжении всего погружения. Напротив,
-<a href="#S_gas_pressure_graph">Гистограмма давления газов</a> в плавающем *Информационном окне</strong> отображает
-=======
 Черная линия, нарисованная выше графика внешнего давления, показывает максимальное допустимое
 перенасыщение согласно значений градиент-фактора, указанных в настройках. Для дайверов, планирующих
-декомпрессионные погружения, эффективное скорость расыщения достигается при давлении в тканях
+декомпрессионные погружения, эффективное скорость рассыщения достигается при давлении в тканях
 большем чем окружающее давление (серая линия), но меньшем чем предельное (черная линия). Это
 представление отображает давление в тканях на протяжении всего погружения. Напротив,
 <a href="#S_gas_pressure_graph">Гистограмма давления газов</a> в плавающем <strong>Информационном окне</strong> отображает
->>>>>>> v4.4-branch
 давление в момент времени, соответствующий положению указателя мыши на оси времени.</td>
 </tr></table>
 </div>
@@ -2959,10 +2855,10 @@ CCR-погружений в дополнение к тем, что были им
 этом позиция будет сохранена и не будет меняться при переключении между
 погружениями. Если мышка находится вне панели, информационное окно отображает
 только заголовок (рисунок <strong>А</strong>). Положение информационного окно запоминается между последовательными
-запусками <em>Subsruface</em>.</p></div>
+запусками <em>Subsurface</em>.</p></div>
 <div class="imageblock" style="text-align:center;">
 <div class="content">
-<img src="images/InfoBox2.jpg" alt="Figure: Information Box" />
+<img src="images/InfoBox2.jpg" alt="Рисунок: Информационное окно" />
 </div>
 </div>
 <div class="paragraph"><p>В момент наведения мышкой на профиль погружения, информационное окно
@@ -3025,7 +2921,7 @@ CCR-погружений в дополнение к тем, что были им
 </td>
 <td class="content">Если этот переключатель нажат, информационное окно показывает <strong>эквивалентную
 глубину по воздуху (EAD)</strong> для погружений на Nitrox и <strong>эквивалентную
-наркозную глубину (END)</strong> для Trmix. Эти значения важны для дайверов,
+наркозную глубину (END)</strong> для Trimix. Эти значения важны для дайверов,
 погружающихся на смесях, отличных от воздуха. Значение этих величин зависят от
 состава газа. EAD - глубина гипотетического погружения на воздухе, в котором
 парциальное значение азота такое же, как и в текущем погружении на Nitrox.
@@ -3040,17 +2936,13 @@ CCR-погружений в дополнение к тем, что были им
 <div class="paragraph"><p>На рисунке <strong>В</strong> выше показано информационное окно практически со всей доступной информацией.</p></div>
 <div class="sect3">
 <h4 id="S_gas_pressure_graph">6.6.1. Гистограмма давления газов</h4>
-<<<<<<< HEAD
-<div class="paragraph"><p>В левой части <strong>Информационного окна</strong> расположена вертикальная гистрограмма, отображающая давление
-=======
 <div class="paragraph"><p>В левой части <strong>Информационного окна</strong> расположена вертикальная гистограмма, отображающая давление
->>>>>>> v4.4-branch
 азота (и других инертных газов, например гелия, там, где это применимо), вдыхаемых дайвером <em>в
 определенный момент времени</em>, соответствующий положению указателя мыши на оси времени. Рисунок ниже
 поясняет, что именно показывает гистограмма:</p></div>
 <div class="imageblock" style="text-align:center;">
 <div class="content">
-<img src="images/GasPressureBarGraph.jpg" alt="FIGURE:Gas Pressure bar Graph" />
+<img src="images/GasPressureBarGraph.jpg" alt="Рисунок: Гистограмма давления газов" />
 </div>
 </div>
 <div class="ulist"><ul>
@@ -3086,11 +2978,7 @@ CCR-погружений в дополнение к тем, что были им
 <li>
 <p>
 Нижняя граница красной области на гистограмме отображает вычисленное по алгоритму Бюльмана
-<<<<<<< HEAD
-  M-значение, - давление инертного газа, при котором весьма вероятно формирование пузырикьков,
-=======
   M-значение, - давление инертного газа, при котором весьма вероятно формирование пузырьков,
->>>>>>> v4.4-branch
   что в свою очередь может привести к декомпрессионной болезни.
 </p>
 </li>
@@ -3143,9 +3031,8 @@ CCR-погружений в дополнение к тем, что были им
 <div class="sectionbody">
 <div class="sect2">
 <h3 id="_контекстное_меню_списка_погружений">7.1. Контекстное меню списка погружений</h3>
-<div class="paragraph"><p>Многие действия <em>Subsurface</em>, связанные с группами погружений, находятся в
-контекстном меню, которое вы можете вызвать, нажав правой кнопкой мыши на
-дайве или группе погружений.</p></div>
+<div class="paragraph"><p>Многие действия <em>Subsurface</em>, связанные с группами погружений, находятся в контекстном меню,
+которое вы можете вызвать, нажав правой кнопкой мыши на дайве или группе погружений.</p></div>
 <div class="imageblock" style="text-align:center;">
 <div class="content">
 <img src="images/ContextMenu.jpg" alt="Рисунок: Контекстное меню" />
@@ -3166,13 +3053,6 @@ CCR-погружений в дополнение к тем, что были им
 <em>Дата</em>. Поставьте или удалите галочки чтобы показать или скрыть поля. <em>Subsurface</em>
 запоминает ваши предпочтения, так что при следующим запуске набор полей останется прежним.</p></div>
 </div>
-<div class="sect3">
-<h4 id="_выбор_дайвов_по_месту_погружения">7.1.2. Выбор дайвов по месту погружения</h4>
-<div class="paragraph"><p>Журнал может быть достаточно большим, что может затруднять поиск погружений по
-их местоположению. Нажмите <em>Ctrl-F</em> - в левом верхнем углу таблицы появится
-поле поиска. Список погружений будет мгновенно отфильтрован по мере ввода в
-это поле.</p></div>
-</div>
 </div>
 <div class="sect2">
 <h3 id="S_Renumber">7.2. Перенумерация погружений</h3>
@@ -3184,6 +3064,10 @@ CCR-погружений в дополнение к тем, что были им
 выберите <em>Журнал &#8594; Перенумеровать</em>. Вам будет предоставлена возможность
 указать начальный номер, после чего погружения будут перенумерованы в
 соответствии с хронологическим порядком.</p></div>
+<div class="paragraph"><p>Вы также можете перенумеровать только избранные погружения. Для это выберите те, для которых
+необходимо изменить нумерацию. Щелкните правой кнопкой мыши на выделенных погружениях и используйте
+появившееся контекстное меню, чтобы выполнить перенумерацию. В появившемся окне вам будет необходимо
+указать начальный номер.</p></div>
 </div>
 <div class="sect2">
 <h3 id="S_Group">7.3. Группировка погружений и работа с поездками</h3>
@@ -3205,7 +3089,7 @@ CCR-погружений в дополнение к тем, что были им
 <div class="sect3">
 <h4 id="_редактирование_поездки">7.3.1. Редактирование поездки</h4>
 <div class="paragraph"><p>Обычно в списке погружения для поездки показывается только ее название. Чтобы
-расширить эту информацию, выберите поездку в списке. после чегj перейдите на
+расширить эту информацию, выберите поездку в списке. после чего перейдите на
 вкладку <strong>Поездка</strong> в информационной панели. Здесь вы можете добавить информацию,
 касающуюся поездки в целом: дату и время, местоположение, название дайв-центра,
 погодные условия и т.п. Сохраните данные, нажав на кнопку <strong>Сохранить</strong> (на
@@ -3230,11 +3114,12 @@ CCR-погружений в дополнение к тем, что были им
 </div>
 <div class="sect3">
 <h4 id="_разбиение_одной_поездки_на_несколько">7.3.5. Разбиение одной поездки на несколько</h4>
-<div class="paragraph"><p>Если, к примеру, поездка включает пять погружений, вы можете разбить ее на две
-(поездка 1: первые три дайва, поездка 2: последние 2 дайва), выделив первые
-три погружения в поездке и вызвав контекстное меню правой кнопкой мыши. В меню
-выберите пункт <strong>Создать поездку выше</strong>. Выбранные три погружения будут
-объединены в отдельную поездку.</p></div>
+<div class="paragraph"><p>Если, к примеру, поездка включает десять погружений, вы можете разбить ее на две
+(поездка 1: первые четыре дайва, поездка 2: оставшиеся 6 погружений), выделив первые
+четыре погружения в поездке и вызвав контекстное меню правой кнопкой мыши. В меню
+выберите пункт <strong>Создать поездку выше</strong>. Выбранные четыре погружения будут
+объединены в отдельную поездку. Рисунок ниже слева (А) иллюстрирует выбор погружений и
+контекстное меню, рисунок справа (Б) - погружения после разбиения:</p></div>
 <div class="imageblock" style="text-align:center;">
 <div class="content">
 <img src="images/SplitDive3a.jpg" alt="Рисунок: Разбиение поездки на две" />
@@ -3284,25 +3169,26 @@ CCR-погружений в дополнение к тем, что были им
 </div>
 </div>
 </div>
+<div class="sect3">
+<h4 id="_отмена_манипуляций_с_погружением">7.4.6. Отмена манипуляций с погружением</h4>
+<div class="paragraph"><p>Критичные действия с погружениями или поездками, описанные выше, могут быть отменены либо
+выполнены повторно. Эти действия включают: <em>удаление погружений</em>, <em>объединение погружений</em> и
+<em>сдвиг времени погружения</em>. Для отмены или повторного выполнения операции выберите в <strong>Главном меню</strong>
+пункт <strong>Редактировать</strong> и в нем соответствующее действие.</p></div>
+</div>
 </div>
 <div class="sect2">
 <h3 id="S_Filter">7.5. Фильтрация списка погружений</h3>
 <div class="paragraph"><p>Вы можете отфильтровать погружения в списке, указав те или иные атрибуты дайва (метки, напарник,
 место погружения, костюм). Например, можно выбрать все глубокие погружения в определенном месте,
 либо пещерные дайвы с вашим другом.</p></div>
-<<<<<<< HEAD
-<div class="paragraph"><p>Чтобы вызвать фильтр, выберите в главном меню <em>Журнал &#8594; Фильтр погружений</em>. Вам будет преставлена
-<em>Панель фильтров</em>, расположенная в верхней части окна <em>Subsurface</em>. В правой части этой панели
-находятся три кнопки, которые позволяют очистить фильтры, спрятать панель или вовсе закрыть её (при
-=======
-<div class="paragraph"><p>Чтобы вызвать фильтр, выберите в главном меню <em>Журнал &#8594; Фильтр погружений</em>. Вам будет преlставлена
+<div class="paragraph"><p>Чтобы вызвать фильтр, выберите в главном меню <em>Журнал &#8594; Фильтр погружений</em>. Вам будет представлена
 <em>Панель фильтров</em>, расположенная в верхней части окна <em>Subsurface</em>. В правой части этой панели
 находятся три кнопки, которые позволяют очистить фильтры, спрятать панель или вовсе закрыть ее (при
->>>>>>> v4.4-branch
-это фильтры очищаются).</p></div>
+этом фильтры очищаются).</p></div>
 <div class="imageblock" style="text-align:center;">
 <div class="content">
-<img src="images/Filterpanel.jpg" alt="Figure: Filter panel" />
+<img src="images/Filterpanel.jpg" alt="Рисунок: Панель фильтров" />
 </div>
 </div>
 <div class="paragraph"><p>Для фильтрации списка погружений используются четыре критерия: метки, люди (партнеры и инструктор),
@@ -3335,17 +3221,10 @@ CCR-погружений в дополнение к тем, что были им
 <h3 id="S_facebook">8.1. Экспорт информации о погружении в <em>Facebook</em></h3>
 <div class="paragraph"><p>Экспорт в <em>Facebook</em> отличается от всех других видов экспорта, поскольку он требует подключения
 учетной записи, что в свою очередь требует от вас логин и пароль <em>Facebook</em>. Для авторизации
-<<<<<<< HEAD
-необхоимо в главном меню выбрать <em>Файл &#8594; Настройки</em> и там выбрать вкладку <em>Facebook</em>, на которой
-вам будет представлена форма авторизации (см. рисунок <strong>А</strong> слева внизу). Авторизуйтесь своими логином
-и паролем, после чего экран должен выглядеть как показано на рисунке <strong>В</strong>. При необходимости вы
-можете отключить <em>Subsurface</em> от <em>Facebook</em>, нажав на соответствующу кнопку.</p></div>
-=======
 необходимо в главном меню выбрать <em>Файл &#8594; Настройки</em> и там выбрать вкладку <em>Facebook</em>, на которой
 вам будет представлена форма авторизации (см. рисунок <strong>А</strong> слева внизу). Авторизуйтесь своими логином
 и паролем, после чего экран должен выглядеть как показано на рисунке <strong>В</strong>. При необходимости вы
 можете отключить <em>Subsurface</em> от <em>Facebook</em>, нажав на соответствующую кнопку.</p></div>
->>>>>>> v4.4-branch
 <div class="imageblock" style="text-align:center;">
 <div class="content">
 <img src="images/facebook1_f20.jpg" alt="Рисунок: Авторизация Facebook" />
@@ -3354,11 +3233,7 @@ CCR-погружений в дополнение к тем, что были им
 <div class="paragraph"><p>После того как соединение с <em>Facebook</em> установлено, публикация профиля погружения в вашей Хронике не
 составит проблем. Выберите погружение в списке и убедитесь в том, что именно этот дайв должен быть
 опубликован. Нажмите кнопку с логотипом <em>Facebook</em>, расположенную в <strong>Информационной панели</strong> справа
-<<<<<<< HEAD
-от поля <em>Прмечания</em> (см. рисунок <strong>А</strong> ниже). По нажатию на эту кнопку вам будет представлено окно, в
-=======
 от поля <em>Примечания</em> (см. рисунок <strong>А</strong> ниже). По нажатию на эту кнопку вам будет представлено окно, в
->>>>>>> v4.4-branch
 котором вы можете выбрать какую дополнительную информацию опубликовать вместе с профилем погружения
 (рисунок <strong>В</strong>). Обязательным является только поле <em>Альбом</em>. Кроме указания стандартных параметров
 погружения, вы можете вручную отредактировать сопроводительный текст. Для отправки профиля
@@ -3371,7 +3246,7 @@ CCR-погружений в дополнение к тем, что были им
 избежать нежелательных записей в вашей Хронике.</p></div>
 <div class="imageblock" style="text-align:center;">
 <div class="content">
-<img src="images/facebook2_f20.jpg" alt="Figure: Facebook login" />
+<img src="images/facebook2_f20.jpg" alt="Рисунок: Авторизация в Facebook" />
 </div>
 </div>
 <div class="paragraph"><p>Разорвать соединение с <em>Facebook</em> можно из <strong>Настроек</strong> приложения, либо просто закрыв <em>Subsurface</em>.</p></div>
@@ -3410,7 +3285,7 @@ CCR-погружений в дополнение к тем, что были им
 <li>
 <p>
 <em>DiveShare</em>, также интернет-сервис для хранения и обмена информацией о рекреационными
-  погружениях. Для выгрузки данных в этот сервис нужен идентификатор польщователя, поэтому
+  погружениях. Для выгрузки данных в этот сервис нужен идентификатор пользователя, поэтому
   вам придется зарегистрироваться на сайте <em>http://scubadiveshare.com</em>.
 </p>
 </li>
@@ -3430,7 +3305,7 @@ CCR-погружений в дополнение к тем, что были им
 <li>
 <p>
 <em>HTML</em> формат. Журнал хранится в HTML-файлах, которые можно просмотреть с
-помощью интернет-броузера. Поддерживаются большинство современных броузеров, но
+помощью интернет-браузера. Поддерживаются большинство современных браузеров, но
 обязательно должна быть включена поддержка Javascript. Предполагается, что вы
 не будете редактировать эти файлы. HTML-журнал содержит максимум информации и
 позволяет выполнять поиск в журнале. Этот вариант экспорта доступен на вкладке
@@ -3455,11 +3330,7 @@ HTML (см. рисунок <strong>В</strong> выше). Вы можете вы
 <li>
 <p>
 <em>Глубины фото</em>. Создает текстовый файл, в котором содержатся имена файлов всех фотографий,
-<<<<<<< HEAD
-прикрепленных к погружениям вместе с указанием глубины, на котороый эти фотографии были сделаны.
-=======
 прикрепленных к погружениям вместе с указанием глубины, на которой эти фотографии были сделаны.
->>>>>>> v4.4-branch
 </p>
 </li>
 <li>
@@ -3470,19 +3341,19 @@ HTML (см. рисунок <strong>В</strong> выше). Вы можете вы
 <li>
 <p>
 Нумерация Subsurface: если выбран этот параметр, то номера погружений будут
-выбираться из <em>Subsurface</em>, иначе дайвы будут пронумерованы начиная с 1.
+   выбираться из <em>Subsurface</em>, иначе дайвы будут пронумерованы начиная с 1.
 </p>
 </li>
 <li>
 <p>
 Статистика за год: если выбран этот параметр, в экспорт будет также включена статистика
-погружений по годам.
+   погружений по годам.
 </p>
 </li>
 <li>
 <p>
 Только список: будет экспортирован только список погружений, а
-дополнительная информация не будет доступна.
+   дополнительная информация не будет доступна.
 </p>
 </li>
 </ul></div>
@@ -3505,12 +3376,98 @@ HTML (см. рисунок <strong>В</strong> выше). Вы можете вы
 только для своего удовольствия, он необходим для дальнейшего прохождения
 курсов, а иногда в некоторых дайв-центрах. Поэтому вы должны обеспечить
 сохранность журнала. На случай выхода из строя жесткого диска вашего
-компьютера, кражи и утери оборудования, хранение в облаке - первое что
-приходит в голову. Еще один плюс - вы можете получить доступ к журналу в любой
-точке мира и вам не нужно иметь его с собой. Именно поэтому сервиса типа
-<em>divelogs.de</em> и <em>Diving Log</em> предлагают хранение журнала в Интернете. И хотя
-<em>Subsurface</em> не имеет интегрированной поддержки хранения журнала в облаке, это
-можно легко сделать, воспользовавшись некоторыми существующими сервисами.</p></div>
+компьютера, кражи и утери оборудования, хранение в облаке - первое что приходит
+в голову. Еще один плюс - вы можете получить доступ к журналу в любой точке
+мира и вам не нужно иметь его с собой. Именно поэтому сервисы типа
+<em>divelogs.de</em> и <em>Diving Log</em> предлагают хранение журнала в Интернете.</p></div>
+<div class="paragraph"><p><em>Subsurface</em> предлашает встроенную поддержку облачного хранилища для всех своих
+пользователей. Сохранение и загрузка журнала погружений в облаке ничем не
+отличается от работы с жестким диском. От вас требуется только регистрация.
+Для использования облачного хранилища <em>Subsurface</em> необходимо выполнить
+следующие шаги:</p></div>
+<div class="sect2">
+<h3 id="_создание_учетной_записи_в_облаке">9.1. Создание учетной записи в облаке</h3>
+<div class="ulist"><ul>
+<li>
+<p>
+Перейдите в настройки сети (в <strong>Главном меню</strong> выберите <em>Файл</em> &#8594; <em>Настройки</em>
+   &#8594; <em>Сеть</em>).
+</p>
+</li>
+<li>
+<p>
+В секции <em>Облачное хранилище Subsurface</em> укажите свой адрес электронной
+   почты, который вы желаете использовать для регистрации.
+</p>
+</li>
+<li>
+<p>
+Укажите надежный пароль, который будет защищать ваш журнал в облаке.
+</p>
+</li>
+<li>
+<p>
+Нажмите кнопку <em>Применить</em>, чтобы отправить адрес почты и пароль на
+   удаленный сервер в облаке. В ответ сервер пришлет вам PIN-код на указанный
+   адрес (это <strong>единственный</strong> случай, когда <em>Subsurface</em> использует ваш адрес).
+   Теперь в настройках сети появится поле PIN, которое ранее не было видно.
+</p>
+</li>
+<li>
+<p>
+ВВедите PIN-код в соответствующее текстовое поле (оно доступно только тогда,
+   когда сервер ожидает подтверждения адреса электронной почты)
+</p>
+</li>
+<li>
+<p>
+Нажмите снова кнопку <em>Применить</em>. Ваша учетная запись будет отмечена
+   как проверенная; облачное хранилище готово к работе.
+</p>
+</li>
+</ul></div>
+</div>
+<div class="sect2">
+<h3 id="_использование_облачного_хранилища">9.2. Использование облачного хранилища</h3>
+<div class="ulist"><ul>
+<li>
+<p>
+После успешной инициализации хранилища, в меню <em>Файл</em> появятся два новых пункта:
+  <em>Открыть облачное хранилище</em> и <em>Сохранить в облаке</em>. Эти действия позволяют
+  соответственно загрузить и сохранить журнал в облаке.
+</p>
+</li>
+<li>
+<p>
+в настройках приложения (вкладка <strong>Общие</strong>) вы можете выбрать опцию хранить журнал погружений
+по умолчанию в облаке. В этом случае <em>Subsurface</em> будет загружать журнал из облака при запуске
+и сохранять при выходе из программы.
+</p>
+</li>
+<li>
+<p>
+<em>Subsurface</em> хранит локальную копию облачного хранилища на жестком диске и позволяет вам
+работать с журналом даже при отсутствии Интернета. При подключении к Интернет ваши локальные
+изменения буду синхронизированы в облако.
+</p>
+</li>
+</ul></div>
+</div>
+<div class="sect2">
+<h3 id="S_Cloud_storage">9.3. Доступ из веб-браузера к облачному хранилищу <em>Subsurface</em></h3>
+<div class="paragraph"><p>Одним из преимуществ облачного хранилища является то, что вы можете получить доступ к данным
+вашего журнала погружений, используя обычный веб-браузер. Откройте ссылку
+<a href="https://cloud.subsurface-divelog.org"><em>https://cloud.subsurface-divelog.org</em></a>, введите свой
+адрес электронной почты и пароль, указанные при регистрации, и вы сможете просматривать журнал в
+HTML-формате (данные погружений последней синхронизации в облачное хранилище <em>Subsurface</em>).
+Информация о погружениях отображает только реальные данные из журнала, вычисляемые значения
+НЕ отображаются (давление в баллонах, деко-потолок, парциальные давления O<sub>2</sub>/He/N<sub>2</sub> и т.п.)</p></div>
+</div>
+<div class="sect2">
+<h3 id="_прочие_облачные_сервисы">9.4. Прочие облачные сервисы</h3>
+<div class="paragraph"><p>Если вы предпочитаете не использовать встроенное облачное хранилище
+<em>Subsurface</em> (и вам не нужен доступ к журналу из веб-браузера), то можно просто
+хранить журнал в облаке, используя другие облачные хранилища в Интернет.</p></div>
 <div class="paragraph"><p>Например, <a href="http://www.dropbox.com/"><em>Dropbox</em></a> предлагает приложение, которое
 позволяет видеть файлы на серверах Dropbox как локальные папки на вашем
 домашнем компьютере.</p></div>
@@ -3539,11 +3496,12 @@ HTML (см. рисунок <strong>В</strong> выше). Вы можете вы
 которые вы можете использовать для хранения журнала в облаке.</p></div>
 </div>
 </div>
+</div>
 <div class="sect1">
 <h2 id="S_PrintDivelog">10. Печать журнала погружений</h2>
 <div class="sectionbody">
-<div class="paragraph"><p><em>Subsurface</em> предоставляет простой интерфейс для печати всего журнала или
-только выбранных погружений, включая профиль и сопутствующую информацию.</p></div>
+<div class="paragraph"><p><em>Subsurface</em> предоставляет простой интерфейс для печати всего журнала или только выбранных погружений, включая профиль и сопутствующую информацию.
+Поставляемые или собственные шаблоны определяют как данные погружения расположены на странице.</p></div>
 <div class="paragraph"><p>Перед печатью вам нужно определиться с двумя вещами:</p></div>
 <div class="ulist"><ul>
 <li>
@@ -3559,64 +3517,130 @@ HTML (см. рисунок <strong>В</strong> выше). Вы можете вы
 </p>
 </li>
 </ul></div>
-<div class="paragraph"><p>Теперь укажите параметры печати. Для этого в главном меню выберите <em>Файл &#8594;
-Print</em>. Вам будет представлено диалоговое окно (см. рисунок <strong>А</strong> ниже):</p></div>
+<div class="paragraph"><p>Теперь укажите параметры печати. Для этого в главном меню выберите <em>Файл &#8594; Print</em>.
+Вам будет представлено диалоговое окно (см. рисунок <strong>А</strong> ниже). Вам необходимо определиться с тремя параметрами:</p></div>
 <div class="imageblock" style="text-align:center;">
 <div class="content">
-<img src="images/PrintDiveLog.jpg" alt="Рисунок: Диалог печати" />
+<img src="images/Print1_f22.jpg" alt="Рисунок: Диалог печати" />
 </div>
 </div>
-<div class="paragraph"><p>Выберите один из пунктов в настройках печати:</p></div>
+<div class="olist arabic"><ol class="arabic">
+<li>
+<p>
+В секции <em>Варианты печати</em> выберите один из пунктов:
+</p>
 <div class="ulist"><ul>
 <li>
 <p>
-Чтобы распечатать список погружений, выберите вариант <em>Таблица</em>
+<em>Печать погружений</em>: печать погружений из списка с профилем и другой информацией.
 </p>
 </li>
 <li>
 <p>
-Печать 6 погружений на странице (включая профиль и прочую информацию)
-</p>
-</li>
-<li>
-<p>
-Печать 2 погружений на странице (включая профиль и прочую информацию)
-</p>
-</li>
-<li>
-<p>
-Печать одного погружения на странице (включая профиль и прочую информацию)
+<em>Печать статистики</em>: печать статистики погружений по годам и месяцам.
 </p>
 </li>
 </ul></div>
-<div class="paragraph"><p>В параметрах печати выберите:</p></div>
+</li>
+<li>
+<p>
+В секции <em>Параметры печати</em> выберите:
+</p>
 <div class="ulist"><ul>
 <li>
 <p>
-Печать выбранных погружений. Если галочка в этом поле не указана, будет
-распечатан весь журнал
+Печать только выбранных погружений из списка. Если этот параметр не выбран,
+  будут распечатаны все погружения из журнала.
 </p>
 </li>
 <li>
 <p>
-Цветная печать
+Параметр <em>Цветная печать</em> указывает будет ли печать цветной или монохромной.
 </p>
 </li>
 </ul></div>
-<div class="paragraph"><p>Макет страницы регулирует будет ли профиль погружения напечатан над текстовой
-информацией или под ней. Выберите подходящий вам вариант.</p></div>
-<div class="paragraph"><p>Перед печатью вы можете предварительно посмотреть результат печати на экране,
-и, при необходимости внести изменения в настройки печати.</p></div>
-<div class="paragraph"><p>Далее, нажмите кнопку <em>Печать</em>. Это вызовет стандартный диалог печати вашей
-операционной системы (см. рисунок <strong>В</strong> выше), где вы можете выбрать принтер и
-его параметры (рисунок <strong>С</strong>).</p></div>
-<div class="paragraph"><p>Возможно вам понадобится указать правильное разрешение принтера.</p></div>
-<div class="paragraph"><p>Ниже приведен пример печати:</p></div>
+</li>
+<li>
+<p>
+В секции <em>Шаблон</em> выберите вариант расположения информации на странице. В штатной поставке
+вам предлагается несколько шаблонов (см. Рисунок В выше).
+</p>
+<div class="ulist"><ul>
+<li>
+<p>
+<em>Table</em>: Печать сводной таблицы погружений (картинка ниже).
+</p>
+</li>
+</ul></div>
+</li>
+</ol></div>
 <div class="imageblock" style="text-align:center;">
 <div class="content">
-<img src="images/Printpreview.jpg" alt="Риснок: Предварительный просмотр печати" />
+<img src="images/Print_summarylist_f22.jpg" alt="Рисунок: Печать сводной таблицы" />
 </div>
 </div>
+<div class="ulist"><ul>
+<li>
+<p>
+<em>Flow layout</em>: Печать данных погружений без профилей:
+</p>
+</li>
+</ul></div>
+<div class="imageblock" style="text-align:center;">
+<div class="content">
+<img src="images/Print_flow_layout_f22.jpg" alt="Рисунок: Печать погружений без профиля" />
+</div>
+</div>
+<div class="ulist"><ul>
+<li>
+<p>
+<em>One Dive</em>: Печать одного погружения на странице вместе с профилем:
+</p>
+</li>
+</ul></div>
+<div class="imageblock" style="text-align:center;">
+<div class="content">
+<img src="images/print2_f22.jpg" alt="Рисунок: Печать одно погружение на странице" />
+</div>
+</div>
+<div class="ulist"><ul>
+<li>
+<p>
+<em>Two Dives</em>: Печать двух погружений на странице вместе с профилями
+</p>
+</li>
+<li>
+<p>
+<em>Six Dives</em>: Печать шести погружений на странице вместе с профилями
+</p>
+</li>
+</ul></div>
+<div class="paragraph"><p>Вы можете предварительно оценить результат печати, нажав на кнопку <em>Просмотр</em>.
+При необходимости поменяйте параметры печати, чтобы добиться желаемого
+результата.</p></div>
+<div class="paragraph"><p>Нажатие на кнопку <em>Печать</em> вызовет стандартный для вашей операционной системы диалог печати,
+в котором вы можете выбрать принтер и установить параметры для него:</p></div>
+<div class="imageblock" style="text-align:center;">
+<div class="content">
+<img src="images/Print_print_f22.jpg" alt="Рисунок: Печать одного погружения на странице" />
+</div>
+</div>
+<div class="paragraph"><p>Установите требуемое разрешение печати и другие параметры и нажмите кнопку <em>Печать</em>. На картинке
+ниже показан пример одного из вариантов печати:</p></div>
+<div class="imageblock" style="text-align:center;">
+<div class="content">
+<img src="images/Printpreview.jpg" alt="Рисунок: Предварительный просмотр результа печати" />
+</div>
+</div>
+<div class="sect2">
+<h3 id="_создание_собственных_шаблонов_печати">10.1. Создание собственных шаблонов печати</h3>
+<div class="paragraph"><p>Собственные шаблоны позволяют вам максимально гибко настроить расположение
+данных погружения на странице. <em>Subsurface</em> использует HTML для разметки
+шаблонов. С помощью соответствующих кнопок, расположенных под списком шаблонов,
+вы можете редактировать, удалять, импортировать и экспортировать шаблоны. В
+<a href="#S_APPENDIX_E">APPENDIX E</a> вы сможете найти информацию о том, как создавать и
+редактировать шаблоны.</p></div>
+</div>
 </div>
 </div>
 <div class="sect1">
@@ -3627,11 +3651,7 @@ Print</em>. Вам будет представлено диалоговое ок
 D3, Vyper, Vytec, Cobra, Gekko И Zoop). Множество параметров компьютера может быть считано и изменено.
 Первым шагом вы должны убедиться что установлены все необходимые драйверы оборудования и что вам известно
 имя устройства. Внимательно ознакомьтесь с информацией в <a href="#APPENDIX_A">ПРИЛОЖЕНИИ А</a>.</p></div>
-<<<<<<< HEAD
-<div class="paragraph"><p>После того, как дайв-компьютер подключен, выберите <em>Файл &#8594; Настройка дайв-компьютера</em> в главом меню.
-=======
 <div class="paragraph"><p>После того, как дайв-компьютер подключен, выберите <em>Файл &#8594; Настройка дайв-компьютера</em> в главном меню.
->>>>>>> v4.4-branch
 Укажите имя устройства в текстовом поле в верхней части окна, и выберите соответствующую модель
 дайв-компьютера в списке слева (см. рисунок ниже).</p></div>
 <div class="imageblock" style="text-align:center;">
@@ -3747,10 +3767,13 @@ D3, Vyper, Vytec, Cobra, Gekko И Zoop). Множество параметров
 единиц глубины, давления, объема, температуры и массы. Переключателями в
 верхней части вы выбираете системы мер для всех единиц сразу, либо выберите
 <strong>Настроить</strong> и укажите единицы для каждой величины по отдельности.</p></div>
+<div class="paragraph"><p>Независимо от вышеперечисленных настроек, вы можете указать единицы измерения
+времени (секунды или минуты). Координаты GPS могут быть представлены либо в
+традиционном формате (градусы, минуты, секунды) либо в десятичном.</p></div>
 </div>
 <div class="sect2">
 <h3 id="_профиль">12.3. Профиль</h3>
-<div class="imageblock" style="text-align:center;">
+<div class="imageblock" id="S_CCR_options" style="text-align:center;">
 <div class="content">
 <img src="images/Pref3_f20.jpg" alt="Рисунок: настройки профиля" />
 </div>
@@ -3800,10 +3823,10 @@ D3, Vyper, Vytec, Cobra, Gekko И Zoop). Множество параметров
 <p>
 <strong>Разное</strong>:
 </p>
-<div class="ulist" id="S_CCR_options"><ul>
+<div class="ulist" id="GradientFactors_Ref"><ul>
 <li>
 <p>
-<em>Градиент фактор</em>: Значения GF Low для глубины и GF High для поверхности.
+<em>Градиент фактор</em>: Значения GFLow для глубины и GFHigh для поверхности.
 Эти значения задают консерватизм азотной экспозиции во время погружения, так
 же, как вы настраиваете консерватизм вашего дайв-компьютера. Меньше значения
 градиент-фактора, тем консервативнее вычисления относительно азотного
@@ -3888,21 +3911,60 @@ D3, Vyper, Vytec, Cobra, Gekko И Zoop). Множество параметров
 </div>
 <div class="sect2">
 <h3 id="_сеть">12.5. Сеть</h3>
-<div class="paragraph"><p>Эти настройки обеспечивают связь <em>Subsurface</em> с Интернет.</p></div>
+<div class="paragraph"><p>Эти настройки обеспечивают связь <em>Subsurface</em> с различными источниками данных в Интернет. Они
+влияют на подключение к облачному хранилищу, импорт координат погружений из
+<a href="#S_Companion"><em>веб-сервиса Subsurface</em></a> и импорт/экспорт данных из <em>Divelogs.de</em>.
+Эти настройки зависят от вашего подключения и поставщика услуг Интернет, который должен предоставить
+вам необходимую информацию.</p></div>
 <div class="imageblock" style="text-align:center;">
 <div class="content">
 <img src="images/Pref5_f20.jpg" alt="Рисунок: Настройки сети" />
 </div>
 </div>
-<div class="paragraph"><p>Соединение с Интернет нужно для импорта GPS-координат из
-<a href="#S_Companion">веб-сервиса Subsurface</a>, импорта с сайта <em>Divelogs.de</em> и для
-отображения карты. В некоторых случаях, например в офисе, для выхода в
-интернет может использоваться прокси-сервер. В этом случае вам необходимо в
-списке выбрать тип сервера и при необходимости указать имя пользователя и
-пароль.</p></div>
+<div class="paragraph"><p>Эта вкладка состоит из трех секций:</p></div>
+<div class="ulist"><ul>
+<li>
+<p>
+Прокси
+Если для соединения с Интернет используется прокси-сервер, вам необходимо выбрать его тип из
+выпадающего списка, после чего указать адрес и порт прокси-сервера. Если прокси-сервер требует
+авторизации, укажите имя пользователя и пароль. Обычно эту информацию предоставляет провайдер
+Интернет-услуг.
+</p>
+</li>
+<li>
+<p>
+<em>Облачное хранилище</em>: Для того, чтобы хранить журнал погружений в облаке, вам необходимо
+   указать корректный адрес электронной почты и пароль. Это позволит <em>Subsurface</em> отправить вам
+   PIN-код и подготовить хранилище. Дополнительно к этому вам предлагаются два параметра:
+</p>
+<div class="ulist"><ul>
+<li>
+<p>
+<em>Фоновая синхронизация</em> позволяет автоматически синхронизировать журнал в облако, в то время
+   как вы выполняете другие задачи внутри <em>Subsurface</em>.
+</p>
+</li>
+<li>
+<p>
+<em>Локальное хранение пароля</em> сохраняет пароль на вашем компьютере. Обратите внимание, что
+   пароль хранится в незашифрованном виде.
+</p>
+</li>
+</ul></div>
+</li>
+<li>
+<p>
+<em>Веб-сервис Subsurface</em>: при регистрации в <a href="#S_Companion">веб-сервисе <em>Subsurface</em></a>, вам
+   генерируется длинный и труднозапоминаемый ключ. Этот ключ необходимо встравить в это поле.
+   Поставьте галочку в поле <em>Сохранять ID пользователя</em>, чтобы сохранить этот ключ на вашем
+   компьютере.
+</p>
+</li>
+</ul></div>
 </div>
 <div class="sect2">
-<h3 id="_соединение_с_em_facebook_em">12.6. Соединение с <em>Facebook</em></h3>
+<h3 id="S_Facebook">12.6. Соединение с <em>Facebook</em></h3>
 <div class="paragraph"><p>Эта вкладка позволяет войти в <em>Facebook</em> для дальнейшей публикации погружений в этой социальной
 сети.</p></div>
 <div class="imageblock" style="text-align:center;">
@@ -3915,6 +3977,10 @@ D3, Vyper, Vytec, Cobra, Gekko И Zoop). Множество параметров
 разорвана. Параметр "Запомнить соединение с Subsurace" на текущий момент ни на что не влияет.
 См. подробнее в главе <a href="#S_facebook">Экспорт информации о погружении в <em>Facebook</em></a>.</p></div>
 </div>
+<div class="sect2">
+<h3 id="_геопривязка">12.7. Геопривязка</h3>
+<div class="paragraph"><p><em>Subsurface</em> предоставляет возможность геопривязки (поиск координат по названию дайв-сайта).</p></div>
+</div>
 </div>
 </div>
 <div class="sect1">
@@ -3989,7 +4055,6 @@ ZH-L16 с добавлением градиент-факторов за авто
 </div>
 <div class="sect2">
 <h3 id="_пример_планирования_погружения_на_открытом_цикле">13.2. Пример планирования погружения на открытом цикле</h3>
-<<<<<<< HEAD
 <div class="ulist"><ul>
 <li>
 <p>
@@ -4004,29 +4069,10 @@ ZH-L16 с добавлением градиент-факторов за авто
 <li>
 <p>
 Ребризер замкнутого цикла (CCR)
-=======
-<div class="ulist"><ul>
-<li>
-<p>
-В левой нижней части экрана планировщика расположен выпадающий список (на рисунке ниже обведен синей линией), предоставляющий варианта типа погружения:
-</p>
-<div class="ulist"><ul>
-<li>
-<p>
-Открытый цикл (по умолчанию)
->>>>>>> v4.4-branch
 </p>
 </li>
 <li>
 <p>
-<<<<<<< HEAD
-=======
-Ребризер замкнутого цикла (CCR)
-</p>
-</li>
-<li>
-<p>
->>>>>>> v4.4-branch
 Пассивный ребризер полузамкнутого цикла (pSCR)
 </p>
 </li>
@@ -4034,39 +4080,150 @@ ZH-L16 с добавлением градиент-факторов за авто
 </li>
 <li>
 <p>
+Выберите режим Открытого цикла.
+</p>
+</li>
+<li>
+<p>
 Удостоверьтесь, что начальные параметры погружения в верхней левой части
-экрана введены правильно. Они включают: начальные дата и время погружения,
-атмосферное давление в точке погружения. Давление может быть задано как
-высота в метрах над уровнем моря, считая атмосферное давление равным 1.013 бар.
+  экрана введены правильно. Они включают: начальные дата и время погружения,
+  атмосферное давление в точке погружения. Давление может быть задано как
+  высота в метрах над уровнем моря, считая атмосферное давление равным 1.013 бар.
 </p>
 </li>
 <li>
 <p>
 В таблице, озаглавленной <em>Доступные газы</em>, добавьте информацию об
-используемых баллонах и составах смесей. Сделать это можно таким же образом,
-как и в случае <a href="#S_CylinderData">добавления баллонов к погружению</a>. Выберите
-тип баллона из выпадающего списка, укажите рабочее давление, Если поле
-процентного содержания кислорода (O<sub>2</sub>%) пустое, то эта смесь считается
-воздухом. В противном случае введите концентрацию кислорода/гелия.
-Дополнительные баллоны можно добавить нажатием на значок "+".
+  используемых баллонах и составах смесей. Сделать это можно таким же образом,
+  как и в случае <a href="#S_CylinderData">добавления баллонов к погружению</a>. Выберите
+  тип баллона из выпадающего списка, укажите рабочее давление, Если поле
+  процентного содержания кислорода (O<sub>2</sub>%) пустое, то эта смесь считается
+  воздухом. В противном случае введите концентрацию кислорода/гелия.
+  Дополнительные баллоны можно добавить нажатием на значок "+".
 </p>
 </li>
 <li>
 <p>
-Таблица "Путевые точки" обычно не используется в этой фазе.
+Профиль планируемого погружения может быть создан двумя способами:
+</p>
+<div class="ulist"><ul>
+<li>
+<p>
+Перетаскивайте путевые точки (маленькие белые кружки), чтобы создать необходимый вам профиль.
+    Дополнительные точки можно создать двойным щелчком мыши. Удалить точку можно правым щелчком мыши
+    ней и выбрав пункт <em>Удалить эту точку</em> из появившегося контекстного меню.
+</p>
+</li>
+<li>
+<p>
+Наиболее эффективный способ создания профиля - ввод необходимых значений в таблицу,
+    озаглавленную <em>Путевые точки плана</em>. Первая строка таблицы описывает время и глубину спуска с
+    поверхности. Последующие сегменты описывают донную фазу погружения. Колонка <em>Установка CC</em> важна
+    только для погружений с ребризером. Точки подъема обычно не указываются, поскольку именно их
+    планировщик и должен рассчитать. Для добавления нового сегмента нажмите значок "+" в правом
+    верхнем углу таблицы. Добавленные сегменты автоматически появляются на графике профиля погружения.
 </p>
 </li>
 </ul></div>
-<div class="paragraph"><p><strong>Планирование состоит из трех фаз</strong></p></div>
-<div class="paragraph"><p><strong>а) Управление азотом</strong>: включает в себя указание скоростей спуска и
-всплытия, а также градиент-факторов (GFLow и GFHigh) в секциях <em>Скорость</em> и
-<em>Планирование</em> в левой нижней части экрана. Изначально значения GFLow и
-GFHigh берутся из настроек <em>Subsurface</em>, однако, если вы их поменяли в
-планировщике, значения по умолчанию в настройках не затрагиваются. Значения
-градиент-фактора влияют на расчет потолка и его глубину. Слишком низкие
-значения ведут к ранним и более глубоким деко-остановкам.
- ** Подробнее читайте в <a href="#S_GradientFactors">настройках градиент-фактора</a> и
- внешних источниках:</p></div>
+</li>
+</ul></div>
+<div class="sect3">
+<h4 id="_рекреационные_погружения">13.2.1. Рекреационные погружения</h4>
+<div class="paragraph"><p>Планировщик <em>Subsurface</em> предлагает изощренный способ планирования рекреационных погружений, т.е.
+погружений в бездекомпрессионных пределах. Он также учитывает насыщение азотом после предыдущих
+погружений. Но традиционные таблицы тоже позволяют вести расчеты по остаточному азоту. Для чего
+тогда нужен планировщик в рекреационных дайвах? При использовании рекреационных таблиц во внимание
+принимается максимальная глубина погружения. Однако мало какие погружения выполняются на постоянной
+глубине, равной максимальной ("квадратный" профиль). Т.е. таблицы чересчур консервативны в отношении
+остаточного азота после предыдущих погружений. Планировщик <em>Subsurface</em> рассчитывает остаточное
+азотное насыщение исходя из реальных профилей ранее совершенных погружений также, как это делает
+дайв-компьютер во время погружения. Это означает, вы что получаете "кредит" в виде времени, не
+проведенного на максимальной глубине во время предыдущих погружений, и как следствие, более долгое
+время последующих погружений. Это также означает, что вы должны загрузить все предыдущие погружения
+в <em>Subsurface</em>, прежде чем пользоваться планировщиком.</p></div>
+<div class="paragraph"><p>Для планирования погружения вам необходимо указать параметры.</p></div>
+<div class="ulist"><ul>
+<li>
+<p>
+Убедитесь в правильности даты и времени планируемого погружения. Это позволит правильно вычислить
+  остаточное насыщение азотом после предыдущих погружений.
+</p>
+</li>
+<li>
+<p>
+Сразу под заголовком <em>Планирование</em> поставьте галочки в полях <em>Рекреационный режим</em> и
+  <em>Остановка безопасности</em>.
+</p>
+</li>
+<li>
+<p>
+Укажите объем баллонов, тип смеси (воздух или % кислорода) и начальное давление в таблице
+  <em>Доступные смеси</em> в левой верхней части планировщика.
+</p>
+</li>
+<li>
+<p>
+Планировщик посчитает достаточно ли указанных газов для выполнения погружения. Для того, чтобы
+  результат был реалистичным, в разделе <em>Газы</em> укажите ваш <em>SAC на дне</em>. Разумные значения лежат
+  в интервале от 15 до 30л/мин (для новичков и сложных погружений ближе к 30л/мин)
+</p>
+</li>
+<li>
+<p>
+Укажите газовый резерв, который должен оставаться в баллоне в конце донной части погружения
+  непосредственно перед подъемом. Зачастую это 50 бар.
+</p>
+</li>
+<li>
+<p>
+Укажите глубину погружения, перетаскивая путевые точки на профиле или (что лучше) задавая
+  необходимые глубины в таблице <em>Путевые точки плана</em>. Для многоуровневых погружений вы также можете
+  добавить новые сегменты в таблицу или создать новые путевые точки непосредственно на профиле.
+</p>
+</li>
+<li>
+<p>
+При необходимости измените скорость всплытия. Значения по умолчанию считаются безопасными для
+  рекреационных дайверов.
+</p>
+</li>
+</ul></div>
+<div class="paragraph"><p>Профиль в планировщике погружений отражает максимальное время погружения в бездекомпрессионных
+пределах согласно алгоритму Бюльмана ZH-L16, а также параметрам газа и глубины, как описано выше.
+<em>Subsurface</em> позволяет быстро оценить длительность погружения как функцию глубины, учитывая
+азотное насыщение после предыдущих дайвов. План также включает оценку расхода газов исходя из
+установок в таблице <em>Доступные смеси</em>. Если начальное давление в баллоне установлено в 0, то
+отображаемое время погружения является истинным NDL без учета используемой смеси. Если профиль
+погружения отображается КРАСНЫМ цветом, это означает, что превышены рекреационные пределы и либо
+глубина, либо время должны уменьшены.</p></div>
+<div class="paragraph"><p>На рисунке ниже приведен план рекреационного погружения на 30 метров. Несмотря на то, что бездекомрпессионный
+предел (NDL) составляет 23 минуты, время погружения ограничено количеством воздуха. Текст в правой
+нижней части экрана сообщает о том, что необходим запас воздуха для поддержки партнера при всплытии.</p></div>
+<div class="imageblock" style="text-align:center;">
+<div class="content">
+<img src="images/rec_diveplan.jpg" alt="Рисунок: План рекреационного погружения" />
+</div>
+</div>
+</div>
+<div class="sect3">
+<h4 id="_нерекреационные_погружения_на_открытом_цикле_включая_декомпрессию">13.2.2. Нерекреационные погружения на открытом цикле, включая декомпрессию</h4>
+<div class="paragraph"><p>Нерекреационные погружения подразумевают превышение бездекомпрессионных пределов и/или использование
+нескольких дыхательный смесей. Планирование таких погружение состоит из трех фаз:</p></div>
+<div class="paragraph"><p><strong>а) Управление азотом</strong>: включает в себя указание скоростей спуска и всплытия, а
+также деко-модели (GFLow, GFHigh или степень консерватизма) в секциях <em>Скорость</em>
+и <em>Планирование</em> в левой нижней части экрана. Выберите одну из двух поддерживаемых
+деко-моделей: Бюльман или VPM-B. Для модели Бюльмана необходимо указать градиент-факторы
+(GFLow и GFHigh).  Изначально значения GFLow и GFHigh берутся из настроек <em>Subsurface</em>,
+однако, если вы их поменяли в планировщике, значения по умолчанию в настройках не
+затрагиваются. Значения градиент-фактора влияют на расчет потолка и его глубину.
+Слишком низкие значения GFLow ведут к ранним и более глубоким деко-остановкам.
+ ** Подробнее читайте в <a href="#S_GradientFactors">настройках градиент-фактора</a> и внешних источниках:</p></div>
+<div class="paragraph"><p>При выборе VPM-B модели необходимо указать уровень консерватизма в диапазоне от 0 (наименее
+консервативный) до 4 (наиболее консервативный). Эта модель обычно предлагает более глубокие
+остановки и зачастую делает погружения немного короче по сравнению с моделью Бюльмана. При выборе
+этих моделей помните, что это не реальные физиологические, а математические модели, которые
+похоже работают на практике.</p></div>
+<div class="paragraph"><p>Вы можете найти больше информации во внешних источниках:</p></div>
 <div class="ulist"><ul>
 <li>
 <p>
@@ -4081,21 +4238,17 @@ GFHigh берутся из настроек <em>Subsurface</em>, однако, 
 <li>
 <p>
 <a href="http://www.amazon.com/Deco-Divers-Decompression-Theory-Physiology/dp/1905492073/ref=sr_1_1?s=books&amp;ie=UTF8&amp;qid=1403932320&amp;sr=1-1&amp;keywords=deco+for+divers"><em>Deco for Divers</em>, by Mark Powell (2008). Aquapress</a> Southend-on-Sea, UK. ISBN 10: 1-905492-07-3.
+Превосходный обзор декомпрессионных моделей Бюльмана и VPM-B.
 </p>
 </li>
 </ul></div>
-<<<<<<< HEAD
 <div class="paragraph"><p>Скорость всплытия важна в фазе рассыщения в конце дайва и указывается для
-=======
-<div class="paragraph"><p>Скорость всплытия важна в фазе расыщения в конце дайва и указывается для
->>>>>>> v4.4-branch
 нескольких диапазонов глубины, принимая во внимание среднюю глубину как точку
 отсчета. Средняя глубина отображается на профиле красной горизонтальной линией.
 Скорость всплытия на больших глубинах находится обычно в пределах 8-12 м/мин,
 в то время, как возле поверхности она обычно составляет 4-9 м/мин. Скорость
 спуска также указывается. Если установлен флажок <em>Падение к первой глубине</em>,
-то в фазе спуска будет использоваться максимальная скорость, указанная в
-секции <em>Скорости</em>.</p></div>
+то в фазе спуска будет использоваться максимальная скорость, указанная в секции <em>Скорости</em>.</p></div>
 <div class="paragraph"><p><strong>б) Управление кислородом</strong>: в секции <em>Газы</em> необходимо указать максимальное
 парциальное давление кислорода в донной фазе (<em>pO₂ на дне</em>) и во время
 декомпрессионных остановок (<em>pO₂ на деко</em>). Обычно используются значения
@@ -4146,13 +4299,8 @@ SAC отдельно для донной фазы (<em>SAC на дне</em>) и
 <div class="paragraph"><p>Ненулевое значение в колонке "Установка СС" в таблице путевых точек означает корректное значение
 установки и что погружение на этом сегменте выполняется на CCR-ребризере. Если последний вручную
 введенный сегмент выполняется на CCR, декомпрессионные процедуры рассчитываются согласно значения
-<<<<<<< HEAD
-указанной уставновки. Если же последний сегмент выполняется на открытом цикле (значение устновки
-равно нулю), декомпрессионные обязательства рассчитаваются в режиме ОЦ. Замена газов предусмотрена
-=======
-указанной установки. Если же последний сегмент выполняется на открытом цикле (значение устновки кислорода
+указанной установки. Если же последний сегмент выполняется на открытом цикле (значение установки кислорода
 равно нулю), декомпрессионные обязательства рассчитываются в режиме ОЦ. Замена газов предусмотрена
->>>>>>> v4.4-branch
 только для открытого цикла.</p></div>
 <div class="paragraph"><p>Ниже на рисунке приведен пример плана погружения на 45м с использованием EAN26
 и всплытием на EAN50, используя настройки, описанные выше:</p></div>
@@ -4163,13 +4311,7 @@ SAC отдельно для донной фазы (<em>SAC на дне</em>) и
 </div>
 <div class="paragraph"><p>После окончания планирование, вы можете сохранить план, нажав на кнопку
 <em>Сохранить</em>. План появится в списке погружений.</p></div>
-<<<<<<< HEAD
-</div>
-<div class="sect2">
-<h3 id="_детальный_план_погружения">13.3. Детальный план погружения</h3>
-=======
 <div class="paragraph"><p><strong>Детальный план погружения</strong></p></div>
->>>>>>> v4.4-branch
 <div class="paragraph"><p>В правой нижней части экрана планировщика находится текстовая область с
 подробным словесным описанием плана погружения. Вы можете изменить его
 детализацию с помощью нескольких параметров в секции <em>Заметки погружения</em>.
@@ -4181,27 +4323,31 @@ SAC отдельно для донной фазы (<em>SAC на дне</em>) и
 перейти к заданной глубине. Однако, если выбран параметр <em>Показать переходы в
 деко</em>, то время переходом показывается отдельно от времени сегментов.</p></div>
 </div>
+</div>
+<div class="sect2">
+<h3 id="_планирование_погружений_на_ребризере_полузамкнутого_типа">13.3. Планирование погружений на ребризере полузамкнутого типа</h3>
+<div class="paragraph"><p>Для планирования таких погружений выберите pSCR в списке, как показано на рисунке выше (список
+обведен синей линией).
+Параметры pSCR-погружений также задаются в *Настройках* (в главном меню выберите <em>Файл &#8594; Настройки</em>
+и вкладку <em>Профиль</em>). К этим настройкам относятся уровень метаболизма и отношение сброса (1:10 по
+умолчанию). Расчеты принимают также во внимание снижение уровня кислорода в области загубника. Если
+значение pO<sub>2</sub> опускается ниже безопасного, в <em>Детальном плане</em> будет отображено предупреждение.
+Обычно pSCR погружение выполняется с одним основным баллоном и несколькими аварийными. Поэтому
+заполнение таблицы доступных баллонов и путевых точек очень похоже на погружение CCR, описанное
+ниже. Однако для pSCR-погружений не указываются установки кислорода.  Ниже приведен план погружения
+с использованием pSCR. Он очень похож на план CCR ниже, но обратите внимание на более долгий подъем,
+что связано с более низким уровнем кислорода, вызванным снижением его количества в области загубника.</p></div>
+<div class="imageblock" style="text-align:center;">
+<div class="content">
+<img src="images/Planner_pSCR1_f20.jpg" alt="Рисунок: планирование pSCR-погружения" />
+</div>
+</div>
+</div>
 <div class="sect2">
-<<<<<<< HEAD
 <h3 id="_планирование_погружений_на_ребризере_замкнутого_цикла">13.4. Планирование погружений на ребризере замкнутого цикла</h3>
 <div class="paragraph"><p>Для планирования таких погружений выберите CCR в списке, как показано на рисунке выше (список
 обведен синей линией).</p></div>
 <div class="paragraph"><p><strong>Доступные смеси</strong>: добавьте в таблицу доступных смесей информацию о баллонах дилуэнта и аварийных
-газах. НЕ вводите информацию о кислородном баллоне, поскольку он подразумеватся при использовании
-режима CCR.</p></div>
-<div class="paragraph"><p><strong>Ввод установок</strong>: укажите значение установки по умолчанию в *Настройках* приложения (в главном меню
-выберите <em>Файл &#8594; Настройки</em> и вкладку <em>Профиль</em>). По умолчанию для всех дабавляемых сегментов
-точка установки берется из настроек, он вы можете поменять их по своему желанию. Значение равное
-нулю означает, что дайвер перешел на открытый цикл. Декомпрессия всегда рассчитывается используя
-последнюю установку вручную добавленного сегмента. Чтобы запланировать переход на ОЦ во время подъема,
-добавьте одноминутный сегмент со значением установки равным нулю. Декомрпессионный алгоритм
-автоматически не меняет смеси для CCR-погружений (с положительной установкой).</p></div>
-<div class="paragraph"><p>Профиль погружения на ребризере замкнутого типа модет выглядеть так:</p></div>
-=======
-<h3 id="_планирование_погружений_на_ребризере_замкнутого_цикла">13.3. Планирование погружений на ребризере замкнутого цикла</h3>
-<div class="paragraph"><p>Для планирования таких погружений выберите CCR в списке, как показано на рисунке выше (список
-обведен синей линией).</p></div>
-<div class="paragraph"><p><strong>Доступные смеси</strong>: добавьте в таблицу доступных смесей информацию о баллонах дилуэнта и аварийных
 газах. НЕ вводите информацию о кислородном баллоне, поскольку он подразумевается при использовании
 режима CCR.</p></div>
 <div class="paragraph"><p><strong>Ввод установок</strong>: укажите значение установки по умолчанию в *Настройках* приложения (в главном меню
@@ -4212,76 +4358,15 @@ SAC отдельно для донной фазы (<em>SAC на дне</em>) и
 добавьте одноминутный сегмент со значением установки равным нулю. Декомпрессионный алгоритм
 автоматически не меняет смеси для CCR-погружений (с положительной установкой).</p></div>
 <div class="paragraph"><p>Профиль погружения на ребризере замкнутого типа может выглядеть так:</p></div>
->>>>>>> v4.4-branch
 <div class="imageblock" style="text-align:center;">
 <div class="content">
 <img src="images/Planner_CCR1_f20.jpg" alt="Рисунок: Планирование CCR-погружения, настройка" />
 </div>
 </div>
-<<<<<<< HEAD
-<div class="paragraph"><p>Обратите внимание, что в <em>Детальном плане погружения</em> расход газа для CCR-сегментов не рассчитывает
-и всегда равен нулю.</p></div>
-</div>
-<div class="sect2">
-<h3 id="_планирование_погружений_на_ребризере_полузамкнутого_типа">13.5. Планирование погружений на ребризере полузамкнутого типа</h3>
-<div class="paragraph"><p>Для планирования таких погружений выберите pSCR в списке, как показано на рисунке выше (список
-обведен синей линией).
-Параметры pSCR-погружений также задаются в *Настройках* (в главном меню выберите <em>Файл &#8594; Настройки</em>
-и вкладку <em>Профиль</em>). К этим настройкам относятся уровень метаболизма и отношение сброса (1:10 по
-умолчанию).
-=== Печать плана погружения</p></div>
-<div class="paragraph"><p>Вы можете распечатать план нажатием на кнопку <em>Печать</em>. Либо можете
-скопировать текст плана и вставить его в любой текстовый редактор. Алгоритм также принимает во
-внимание сброс газа из загубника. Если уровень pO<sub>2</sub> падает ниже безопасного значения, в
-<em>Детальном плане погружения</em> отображается предупреждение. Типичная конфигурация для погружения
-на ребризере полузамкнотого цикла включаеи один баллон и несколько аварийных баллонов. Поэтому
-содержимое таблиц <em>Доступные смеси</em> и <em>Путевые точки</em> очень похожи на те, что описаны для погружений
-на закрытом цикле выше. Однако, для pSCR погружений не указываются установки. Ниже приведен пример
-плана для позамкнутого цикла. Он очень похож на профиль CCR за тем исключением, что сегменты на
-всплытии длиннее, что связано с пониженным содержанием кислорода в системе из-за сброса из загубника.</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.6. Изменение существующего плана</h3>
-<div class="paragraph"><p>Обычно, после сохранения плана, он доступен в <strong>Списке погружений</strong>. <em>Subsurface</em> не предоставляет
-возможности изменить план из списка. Для того, чтобы изменить план, выберите его в списке. Затем в
-главном меню выберите <em>Журнал &#8594; Перепланировать</em>. Это действие откроет планировщик с существующим
-планом, позволяя изменить его.</p></div>
-<div class="paragraph"><p>В случае перепланирования у вас появляется возможность <strong>Сохранить новый</strong> план, для того, чтобы
-не перезаписывать старый. Если новая копия сохраняется с тем же временем, что и старый план, то они
-считаются двумя версиями одного плана и не влияют друг на друга при вычислении декомпрессионных
-обязательств.</p></div>
-</div>
-<div class="sect2">
-<h3 id="_планирование_повторных_погружений">13.7. Планирование повторных погружений</h3>
-=======
 <div class="paragraph"><p>Обратите внимание, что в <em>Детальном плане погружения</em> расход газа для CCR-сегментов не рассчитывается
 и всегда равен нулю.</p></div>
 </div>
 <div class="sect2">
-<h3 id="_планирование_погружений_на_ребризере_полузамкнутого_типа">13.4. Планирование погружений на ребризере полузамкнутого типа</h3>
-<div class="paragraph"><p>Для планирования таких погружений выберите pSCR в списке, как показано на рисунке выше (список
-обведен синей линией).
-Параметры pSCR-погружений также задаются в *Настройках* (в главном меню выберите <em>Файл &#8594; Настройки</em>
-и вкладку <em>Профиль</em>). К этим настройкам относятся уровень метаболизма и отношение сброса (1:10 по
-умолчанию). Расчеты принимают также во внимание снижение уровня кислорода в области загуюника. Если
-значение pO<sub>2</sub> опускается ниже безопасного, в <em>Детальном плане</em> будет отображено предупреждение.
-Обычно pSCR погружение выполняется с одним основным баллоном и несколькими аварийными. Поэтому
-заполнение таблицы доступных баллонов и путевых точек очень похоже на погружение CCR, описанное
-выше. Однако для pSCR-погружений не указываются установки кислорода.  Ниже приведен план погружения
-с использованием pSCR. Он очень похож на план CCR выше, но обратите внимание на более долгий подъем,
-что связано с более низким уровнем кислорода, вызванным снижением его количества в области загубника.</p></div>
-<div class="imageblock" style="text-align:center;">
-<div class="content">
-<img src="images/Planner_pSCR1_f20.jpg" alt="Рисунок: планирование pSCR-погружения" />
-</div>
-</div>
-</div>
-<div class="sect2">
 <h3 id="S_Replan">13.5. Изменение существующего плана</h3>
 <div class="paragraph"><p>Обычно, после сохранения плана, он доступен в <strong>Списке погружений</strong>. <em>Subsurface</em> не предоставляет
 возможности изменить план из списка. Для того, чтобы изменить план, выберите его в списке. Затем в
@@ -4294,7 +4379,6 @@ SAC отдельно для донной фазы (<em>SAC на дне</em>) и
 </div>
 <div class="sect2">
 <h3 id="_планирование_повторных_погружений">13.6. Планирование повторных погружений</h3>
->>>>>>> v4.4-branch
 <div class="paragraph"><p><em>Subsurface</em> позволяет планировать повторные погружения при условии, что вы
 корректно укажете дату и время начала. При этом учитывается остаточное
 насыщение после предыдущего погружения.</p></div>
@@ -4309,11 +4393,7 @@ SAC отдельно для донной фазы (<em>SAC на дне</em>) и
 для нового плана будет использоваться конфигурация из шаблона.</p></div>
 </div>
 <div class="sect2">
-<<<<<<< HEAD
-<h3 id="_печать_плана_погружения">13.8. Печать плана погружения</h3>
-=======
 <h3 id="_печать_плана_погружения">13.7. Печать плана погружения</h3>
->>>>>>> v4.4-branch
 <div class="paragraph"><p>Вы можете распечатать план погружения с тем чтобы взять его с собой под воду, нажав кнопку <em>Печать</em>.
 Альтернативный способ - скопировать текст из <em>Детального плана погружения</em> и вставить его в в ваш
 любимый текстовый редактор.</p></div>
@@ -4340,7 +4420,14 @@ SAC отдельно для донной фазы (<em>SAC на дне</em>) и
 </li>
 <li>
 <p>
-<em>Открыть журнал</em> - Вызывает диалог выбора файла для открытия журнала.
+<em>Открыть журнал</em> - Вызывает диалог выбора файла для открытия
+   журнала.
+</p>
+</li>
+<li>
+<p>
+<em>Открыть облачное хранилище</em> - Загружает ранее сохраненный журнал из
+   <a href="#S_Cloud_storage"><em>облачного хранилища</em></a>.
 </p>
 </li>
 <li>
@@ -4350,6 +4437,11 @@ SAC отдельно для донной фазы (<em>SAC на дне</em>) и
 </li>
 <li>
 <p>
+<em>Сохранить в облаке</em> - Сохраняет журнал в <a href="#S_Cloud_storage"><em>облачном хранилище</em></a>.
+</p>
+</li>
+<li>
+<p>
 <em>Сохранить как</em> - Сохраняет текущий журнал в файл с новым именем
 </p>
 </li>
@@ -4376,6 +4468,12 @@ SAC отдельно для донной фазы (<em>SAC на дне</em>) и
 </li>
 <li>
 <p>
+<a href="#S_FindMovedImages"><em>Найти перемещенные фото</em></a> - Если ранее загруженные фотографии были перенесены
+  в другое место, найти их и обновить их местоположение в соответствующих погружениях.
+</p>
+</li>
+<li>
+<p>
 <em>Выход</em> - Выйти из <em>Subsurface</em>
 </p>
 </li>
@@ -4420,6 +4518,11 @@ SAC отдельно для донной фазы (<em>SAC на дне</em>) и
 </li>
 <li>
 <p>
+<em>Редактировать погружение</em> - Позволяет отредактировать погружение, введенное вручную.
+</p>
+</li>
+<li>
+<p>
 <a href="#S_DivePlanner"><em>Планировщик</em></a> - запускает планировщик погружений.
 </p>
 </li>
@@ -4436,7 +4539,8 @@ SAC отдельно для донной фазы (<em>SAC на дне</em>) и
 </li>
 <li>
 <p>
-<em>Вставить параметры погружения</em> - вставить из буфера в выделенные погружения
+<em>Вставить параметры погружения</em> - вставить из буфера параметры, скопированные ранее,
+   в выделенные погружения
 </p>
 </li>
 <li>
@@ -4515,7 +4619,17 @@ SAC отдельно для донной фазы (<em>SAC на дне</em>) и
 </ul></div>
 </div>
 <div class="sect2">
-<h3 id="_помощь">14.5. Помощь</h3>
+<h3 id="_поделиться">14.5. Поделиться</h3>
+<div class="ulist"><ul>
+<li>
+<p>
+- <a href="#S_Facebook"><em>Facebook</em></a> - поделиться информацией о выбранном погружении в вашей хронике на Facebook.
+</p>
+</li>
+</ul></div>
+</div>
+<div class="sect2">
+<h3 id="_помощь">14.6. Помощь</h3>
 <div class="ulist"><ul>
 <li>
 <p>
@@ -4531,6 +4645,11 @@ SAC отдельно для донной фазы (<em>SAC на дне</em>) и
 </li>
 <li>
 <p>
+<a href="#S_UserSurvey"><em>Опрос пользователей</em></a> - помогите нам улучшить <em>Subsurface</em>, заполнив опросник.
+</p>
+</li>
+<li>
+<p>
 <em>Руководство пользователя</em> - открывает этот документ в новом окне.
 </p>
 </li>
@@ -4572,7 +4691,7 @@ SAC отдельно для донной фазы (<em>SAC на дне</em>) и
 <p>
 Пользователям MAC возможно придется самим найти соответствующий драйвер.
           Например, для Mares Puck и других дайв-компьютеров, использующих
-          интерфейс USB-последовательный порт на основе чипа Silicon Labs CP2101,
+          интерфейс последовательного USB-порта на основе чипа Silicon Labs CP2101,
           необходимый драйвер с именем <em>Mac_OSX_VCP_Driver.zip</em> можно взять на
           сайте <a href="http://www.silabs.com/support/pages/document-library.aspx?p=Interface&amp;f=USB%20Bridges&amp;pn=CP2101">Silicon Labs document and software repository</a>.
 </p>
@@ -4726,54 +4845,204 @@ Bluetooth&#8230;</em>. Дайв-компьютер должен появитьс
 углу рабочего стола должен быть значок Bluetooth. Выберите <em>Настроить новое
 устройство</em>. В появившемся окне выберите дайв-компьютер и выполните
 сопряжение. Если у вас запросят PIN-код, попробуйте ввести <em>0000</em>.</p></div>
-<div class="paragraph"><p>В редких случаях, когда вышесказанное не подходит для вашей системе, вам
-возможно придется загрузить дополнительные модули. Помимо этого, если ваша
-система использует <code>systemd</code>, необходиму вручную выполнить команду <code>systemctl
-start bluetooth.service</code>. Для систем, использующих <code>initd</code>, надо выполнить
-что-то вида <code>rc.config start bluetoothd</code> или <code>/etc/init.d/bluetooth start</code>.</p></div>
-<div class="paragraph"><p>Можно также попробовать настроить соединение вручную использую команды:</p></div>
+<div class="paragraph"><p>Установка соединения для загрузки погружений из дайв-компьютеров с интерфейсом Bluetooth, таких,
+как <em>Shearwater Petrel</em>, пока что не автоматизирована и в общем случае потребует от вас работы
+в коммандной строке. Этот процесс состоит из трех шагов.</p></div>
 <div class="ulist"><ul>
 <li>
 <p>
-<code>hciconfig</code> показывает Bluetooth устройства, доступные на вашем компьютере
-   (не дайв-компьютер). Наиболее вероятно что-то вида hci0. Если вы не видите
-   устройств, попробуйте выполнить <code>hcitool -a</code>, чтобы увидеть неактивные
-   устройства и выполните <code>sudo hciconfig hci0 up</code> чтобы активировать их.
+Включите Bluetooth-адаптер и установите сопряжение с дайв-компьютером
 </p>
 </li>
 <li>
 <p>
-<code>hcitool scanning</code> возвращает список доступных клиентских устройств. Найдите
-   в нем дайв-компьютер и запомните его MAC-адрес.
+Установите RFCOMM-соединение
 </p>
 </li>
 <li>
 <p>
-<code>bluez-simple-agent hci0 10:00:E8:C4:BE:C4</code> сопрягает вам настольный ПК и
-   дайв-компьютер. Подставьте MAC-адрес дайв-компьютера из вывода команды
-   <em>hcitool scanning</em>.
+Загрузите погружения с помощь <em>Subsurface</em>
 </p>
 </li>
 </ul></div>
-<div class="paragraph"><p>К сожалению в Linux связывание коммуникационного устройства необходимо
-делать вручную:</p></div>
+<div class="paragraph"><p>Убедитесь, что дайв-компьютер в режиме выгрузки. На <em>Shearwater Petrel</em> и <em>Petrel 2</em> выберите
+в меню <em>Dive Log</em>, затем <em>Upload Log</em>. На дисплее высветится <em>Initializing</em>, <em>Wait PC 3:00</em> и
+начнется обратный отсчет. После установки соединения на дисплее высветится <em>Wait CMD &#8230;</em> и
+отсчет продолжится. Во время загрузки погружений на дисплее отображается надпись <em>Sending</em>, а
+затем <em>Sent Dive</em>.</p></div>
+<div class="paragraph"><p>Чтобы установить соединение, вам нужно получить полномочия суперпользователя с помощью команд
+<code>sudo</code> или <code>su</code>. Для загрузки погружений у пользователя должны быть полномочия. В большинстве
+Linux-дистрибутивов пользователю достаточно быть членом группы dialout (что также действительно
+и для дайв-компьютеров с USB-интерфейсом). В командой строке введите команду:</p></div>
+<div class="paragraph"><p><code>sudo usermod -a -G dialout username</code></p></div>
+<div class="paragraph"><p>После этого завершите сеанс и войдите в систему заново.</p></div>
+<div class="sect3">
+<h4 id="_включение_bluetooth_контроллера_и_сопряжение_с_дайв_компьютером">15.3.1. Включение Bluetooth-контроллера и сопряжение с дайв-компьютером</h4>
+<div class="paragraph"><p>Попробуйте настроить Bluetooth-контроллер и сопряжение с дайв-компьютером посредством штатного
+графического интерфейса операционной системы. После перевода дайв-компьютера в режим выгрузки,
+щелкните по значку Bluetooth в области уведомлений и выберите <em>Добавить новое устройство</em>. Дайв-
+компьютер должен появиться в списке. Если у вас запросяи пароль, введите 0000. Запишите или скопируйте
+MAC-адрес дайв-компьютера, он понадобится позже (адрес имеет вид 00:11:22:33:44:55).</p></div>
+<div class="paragraph"><p>Если этот метод не сработал, попробуйте сделать сопряжение из командной строки. Откройте терминал и
+используйте <code>hciconfig</code>, чтобы проверить статус Bluetooth-контроллера:</p></div>
+<div class="literalblock">
+<div class="content">
+<pre><code>$ hciconfig
+hci0:   Type: BR/EDR  Bus: USB
+        BD Address: 01:23:45:67:89:AB  ACL MTU: 310:10  SCO MTU: 64:8
+        *DOWN*
+        RX bytes:504 acl:0 sco:0 events:22 errors:0
+        TX bytes:92 acl:0 sco:0 commands:21 errors:0</code></pre>
+</div></div>
+<div class="paragraph"><p>Тут мы видим, что контроллер с адресом 01:23:45:67:89:AB подключен как hci0. Его состояние <em>DOWN</em>,
+т.е. выключен. Дополнительные контроллеры будут представлены как hci1, и т.д. Теперь необходимо
+включить питание контроллера:</p></div>
+<div class="literalblock">
+<div class="content">
+<pre><code>sudo hciconfig hci0 up auth+  (enter password when prompted)
+hciconfig
+hci0:  Type: BR/EDR  Bus: USB
+        BD Address: 01:23:45:67:89:AB  ACL MTU: 310:10  SCO MTU: 64:8
+        *UP RUNNING PSCAN AUTH*
+        RX bytes:1026 acl:0 sco:0 events:47 errors:0
+        TX bytes:449 acl:0 sco:0 commands:46 errors:0</code></pre>
+</div></div>
+<div class="paragraph"><p>Удостоверьтесь, что статус контроллера теперь содержит <code><em>UP</em>, <em>RUNNING</em> и <em>AUTH</em></code>.</p></div>
+<div class="paragraph"><p>Если на компьютере несколько Bluetooth-контроллеров, остальные можно выключиться, чтобы избежать путаницы:</p></div>
+<div class="literalblock">
+<div class="content">
+<pre><code>sudo hciconfig hci1 down</code></pre>
+</div></div>
+<div class="paragraph"><p>Следующий шаг: установить доверенное сопряжение с дайв-компьютером. В дистрибутивах с установленным
+пакетом BlueZ (например, Fedora 22) вы можете использовать <code>blutootctl</code>, который имеет собственную подсказку:</p></div>
+<div class="literalblock">
+<div class="content">
+<pre><code>bluetoothctl
+[NEW] Controller 01:23:45:67:89:AB localhost.localdomain [default]
+[bluetooth]# agent on
+Agent registered
+[bluetooth]# default-agent
+Default agent request successful
+[bluetooth]# scan on                        &lt;----теперь переведите дайв-компьютер в режим выгрузки
+Discovery started
+[CHG] Controller 01:23:45:67:89:AB Discovering: yes
+[NEW] Device 00:11:22:33:44:55 Petrel
+[bluetooth]# trust 00:11:22:33:44:55        &lt;----вы можете использовать клавишу TAB для автодополнения MAC-адреса
+[CHG] Device 00:11:22:33:44:55 Trusted: yes
+Changing 00:11:22:33:44:55 trust succeeded
+[bluetooth]# pair 00:11:22:33:44:55
+Attempting to pair with 00:11:22:33:44:55
+[CHG] Device 00:11:22:33:44:55 Connected: yes
+[CHG] Device 00:11:22:33:44:55 UUIDs: 00001101-0000-1000-8000-0089abc12345
+[CHG] Device 00:11:22:33:44:55 Paired: yes
+Pairing successful
+[CHG] Device 00:11:22:33:44:55 Connected: no</code></pre>
+</div></div>
+<div class="paragraph"><p>Если будет запрошен пароль, введите 0000. Ничего страшного в том, что в последней строке содержится
+фраза <em>Connected: no</em>, главное тут - сообщение строкой выше <em>Pairing successful</em>.</p></div>
+<div class="paragraph"><p>Если в системе установлен пакет BlueZ версии 4 (например, в Ubuntu 12.04 до 15.04), то скорее всего
+в ней нет <code>bluetoothctl</code>, но есть утилита <code>bluez-simple-agent</code> или просто <code>simple-agent</code>.</p></div>
+<div class="literalblock">
+<div class="content">
+<pre><code>hcitool -i hci0 scanning
+Scanning ...
+        00:11:22:33:44:55       Petrel
+        bluez-simple-agent hci0 00:11:22:33:44:55</code></pre>
+</div></div>
+<div class="paragraph"><p>После сопряжения необходимо установить RFCOMM-соединение.</p></div>
+</div>
+<div class="sect3">
+<h4 id="_установка_rfcomm_соединения">15.3.2. Установка RFCOMM-соединения</h4>
+<div class="paragraph"><p>Для установки RFCOMM-соединения используйте следующую команду:</p></div>
+<div class="paragraph"><p><code>sudo rfcomm -i &lt;controller&gt; connect &lt;dev&gt; &lt;bdaddr&gt; [channel]</code></p></div>
 <div class="ulist"><ul>
 <li>
 <p>
-<code>rfcomm bind /dev/rfcomm0 10:00:E8:C4:BE:C4</code> связывает дайв-компьютер с
-   коммуникационным устройством. Если rfcomm0 уже занят, попробуйте rfcomm1 и
-   далее. ВАЖНО: Подставьте MAC-адрес дайв-компьютера из вывода команды
-   <em>hcitool scanning</em>. Приведенный в качестве примера адрес не будет работать.
+&lt;controller&gt; - Bluetooth-контроллер, <code>hci0</code>.
+</p>
+</li>
+<li>
+<p>
+&lt;dev&gt; - устройство RFCOMM, <code>rfcomm0</code>
+</p>
+</li>
+<li>
+<p>
+&lt;bdaddr&gt; - MAC-адрес дайв-компьютера, <code>00:11:22:33:44:55</code>
+</p>
+</li>
+<li>
+<p>
+[channel] - Bluetooth-канал дайв-компьютера, к которому на необходимо подключиться.
 </p>
 </li>
 </ul></div>
-<div class="paragraph"><p>Для импорта погружений в <em>Subsurface</em> используйте имя устройства, связанное с
-MAC-адресом дайв-компьютера, т.е. <em>/dev/rfcomm0</em> из примера выше.</p></div>
+<div class="paragraph"><p>Если канал не указать, по умолчанию будет выбран 1. Основываясь на сообщениях наших пользователей,
+ниже приведен список каналов для различных моделей дайв-компьютеров:</p></div>
+<div class="ulist"><ul>
+<li>
+<p>
+<em>Shearwater Petrel 2</em>: канал 5
+</p>
+</li>
+<li>
+<p>
+<em>Shearwater Petrel 1</em>: канал 1
+</p>
+</li>
+<li>
+<p>
+<em>Heinrichs-Weikamp OSTC Sport</em>: канал 1
+</p>
+</li>
+</ul></div>
+<div class="paragraph"><p>Таким образом, чтобы подключить <em>Shearwater Petrel 2</em>, переведите его в режим выгрузки и введите команду:</p></div>
+<div class="literalblock">
+<div class="content">
+<pre><code>sudo rfcomm -i hci0 connect rfcomm0 00:11:22:33:44:55 5 (если вас запросят пароль, введите 0000)</code></pre>
+</div></div>
+<div class="paragraph"><p>В ответ вы должны получить сообщение:</p></div>
+<div class="literalblock">
+<div class="content">
+<pre><code>Connected /dev/rfcomm0 to 00:11:22:33:44:55 on channel 5
+Press CTRL-C for hangup</code></pre>
+</div></div>
+<div class="paragraph"><p>Для подключения _Shearwater Petrel 1+ или <code>HW OSTC Sport</code>, переведите компьютер в режим загрузки и введите команду:</p></div>
+<div class="literalblock">
+<div class="content">
+<pre><code>sudo rfcomm -i hci0 connect rfcomm0 00:11:22:33:44:55 (если вас запросят пароль, введите 0000)
+Connected /dev/rfcomm0 to 00:11:22:33:44:55 on channel 1
+Press CTRL-C for hangup</code></pre>
+</div></div>
+<div class="paragraph"><p>Если номер Bluetooth-канала неизвестен, либо указанный номер не работает, определить его вам поможет
+команда <code>sdptool records</code>. Ниже приведен её вывод для дайв-компьютера <em>Shearwater Petrel 2</em>:</p></div>
+<div class="literalblock">
+<div class="content">
+<pre><code>sdptool -i hci0 records 00:11:22:33:44:55
+Service Name: Serial Port
+Service RecHandle: 0x10000
+Service Class ID List:
+        "Serial Port" (0x1101)
+        Protocol Descriptor List:
+        "L2CAP" (0x0100)
+        "RFCOMM" (0x0003)
+        Channel: 5</code></pre>
+</div></div>
+<div class="paragraph"><p>Если ваш дайв-компьютер не в списке, или номер канала отличается, пожалуйста, сообщите об этом
+разработчикам <em>Subsurface</em> через форум пользователей или список рассылки <em>subsurface@subsurface-divelog.org</em>.</p></div>
+</div>
+<div class="sect3">
+<h4 id="_загрузка_погружений_в_subsurface">15.3.3. Загрузка погружений в Subsurface</h4>
+<div class="paragraph"><p>После установки RFCOMM-соединения и пока идет обратный отсчет режима выгрузки на дайв-компьютере,
+перейдите в <em>Subsurface</em>, выберите <em>Импорт &#8594; Импорт из дайв-компьютера</em>, укажите производителя
+(например, <em>Shearwater</em>), модель (<em>Petrel</em>), устройство или точку монтирования (<em>/dev/rfcomm0</em>) и
+и нажмите <em>Загрузить</em>.</p></div>
+</div>
 </div>
 </div>
 </div>
 <div class="sect1">
-<h2 id="APPENDIX_B">16. ПРИЛОЖЕНИЕ Б: Настройка дайв-компьютеров для импорта</h2>
+<h2 id="_appendix_b_dive_computer_specific_information_for_importing_dive_information">16. ПРИЛОЖЕНИЕ Б: Настройка дайв-компьютеров для импорта</h2>
 <div class="sectionbody">
 <div class="sect2">
 <h3 id="S_ImportUemis">16.1. Импорт погружений из Uemis Zurich</h3>
@@ -4829,8 +5098,10 @@ IrDA, однако вам придется дополнительно загру
 импорт.</p></div>
 <div class="paragraph"><p>С Windows ситуация схожая. Драйвера для контроллера MCS7780 доступны на
 нескольких интернет-сайтах, например на
-<a href="http://www.drivers-download.com/Drv/MosChip/MCS7780/">www.drivers-download.com</a>.</p></div>
-<div class="paragraph"><p>Для Apple Mac, коммуникации через MCS7780 невозможны для версий OSX 10.6 и
+<a href="http://www.drivers-download.com/Drv/MosChip/MCS7780/">www.drivers-download.com</a>. IrDA драйверы для
+Windows для компьютеров также могут быть загружены с веб-сайта ScubaPro со страницы загрузки
+программного обеспечения ScubaPro SmartTrak.</p></div>
+<div class="paragraph"><p>Для Apple Mac, IrDA-соединение через MCS7780 невозможно для версий OSX 10.6 и
 выше.</p></div>
 </div>
 <div class="sect2">
@@ -4852,9 +5123,6 @@ UDDF-файл для каждого погружения. Выделите вс
 </div>
 </div>
 <div class="sect2">
-<<<<<<< HEAD
-<h3 id="_импорт_погружений_из_shearwater_predator_используя_bluetooth">16.4. Импорт погружений из Shearwater Predator используя Bluetooth</h3>
-=======
 <h3 id="S_ImportingXDeep">16.4. Импорт погружений из xDEEP BLACK</h3>
 <div class="admonitionblock">
 <table><tr>
@@ -4873,38 +5141,14 @@ UDDF-файл для каждого погружения. Выделите вс
 </div>
 <div class="sect2">
 <h3 id="_импорт_погружений_из_shearwater_predator_используя_bluetooth">16.5. Импорт погружений из Shearwater Predator используя Bluetooth</h3>
->>>>>>> v4.4-branch
 <div class="admonitionblock">
 <table><tr>
 <td class="icon">
 <img src="images/icons/predator.jpg" alt="Замечание" />
 </td>
-<td class="content">Используя Shearwater Predator, вы возможно успешно свяжете устройство с ПК,
-но можете при импорте столкнуться с ошибками вида: <em>Slip RX: unexp. SLIP END</em>.
-Они также могут возникнуть при использовании других программ и операционных
-систем, отличных от Linux. У разработчиков пока нет мыслей, что может вызывать
-эти ошибки, но некоторым пользователям следующие шаги помогли решить эти
-проблемы:</td>
+<td class="content">Инструкции по загрузке погружений через Bluetooth приведены выше в главе <a href="#S_Bluetooth"><em>Подключение _Subsurface</em> к дайв-компьютеру через Bluetooth_</a></td>
 </tr></table>
 </div>
-<div class="ulist"><ul>
-<li>
-<p>
-используйте USB-брелок который шел вместе с вашим Shearwater Predator
-   вместо того, что установлен в вашем персональном компьютере
-</p>
-</li>
-<li>
-<p>
-попробуйте поменять драйвера вашего Bluetooth оборудования на другие
-</p>
-</li>
-<li>
-<p>
-отключите WiFi перед использованием Bluetooth
-</p>
-</li>
-</ul></div>
 </div>
 <div class="sect2">
 <h3 id="S_PoseidonMkVI">16.6. Импорт погружений из Poseidon MkVI Discovery</h3>
@@ -4950,13 +5194,18 @@ UDDF-файл для каждого погружения. Выделите вс
 <td class="content">Журналы погружений APD Inspiration и похожих CCR дайв-компьютеров можно загрузить, используя
 специальный коммуникационный адаптер и программное обеспечение <em>AP Communicator</em>, предоставляемые
 при покупке оборудования. Просмотреть журналы на платформах Windows и Mac/OS можно, используя
-<em>AP Log Viewer</em>. Однако вы также можете получить доступ к этим погружениям и из <em>Subsurface</em>. Для
+<em>AP Log Viewer</em>. Вы также можете получить доступ к этим погружениям и из <em>Subsurface</em>. Для
 импорта погружений APD Inspiration необходимо выполнить следующие шаги:</td>
 </tr></table>
 </div>
 <div class="ulist"><ul>
 <li>
 <p>
+Загрузите погружение используя <em>AP Communicator</em>.
+</p>
+</li>
+<li>
+<p>
 Откройте погружение в <em>AP Log Viewer</em>.
 </p>
 </li>
@@ -4977,7 +5226,7 @@ UDDF-файл для каждого погружения. Выделите вс
 </li>
 <li>
 <p>
-Вставьте данные из буфера обмена в редактор и сохраните файл с расширением .CSV
+Вставьте данные из буфера обмена в редактор и сохраните файл с расширением <em>.APD</em>
 </p>
 </li>
 <li>
@@ -4988,7 +5237,7 @@ UDDF-файл для каждого погружения. Выделите вс
 </li>
 <li>
 <p>
-В окне в правой нижней части выберите тип "CSV-файлы"
+В окне в правой нижней части выберите тип "APD-файлы"
 </p>
 </li>
 <li>
@@ -4999,21 +5248,39 @@ UDDF-файл для каждого погружения. Выделите вс
 </li>
 <li>
 <p>
-В списке в левой верхней части экрана выберите <em>APD Log Viewer</em>.
+Внесите по необходимости изменения в параметры импорта, как описано в главе <a href="#S_ImportingCSVDives">Импорт CSV-файлов</a>.
+</p>
+</li>
+</ul></div>
+<div class="imageblock" style="text-align:center;">
+<div class="content">
+<img src="images/APD_CSVimportF22.jpg" alt="Рисунок: Импорт файлов APD log viewer" />
+</div>
+</div>
+<div class="ulist"><ul>
+<li>
+<p>
+Выпадающий список в левом верхнем углу позволяет указать журнал какого именно компьютера необходимо
+  импортировать. По умолчанию это первый компьютер (DC1). Вы можете последовательно импортировать
+  данные погружения сначала для DC1, а потом для DC2 (при просмотре погружения в <em>Subsurface</em> вы можете
+  переключаться между дайв-компьютерами, выбрав в главном меню <em>Вид &#8594; След. компьютер</em>).
 </p>
 </li>
 <li>
 <p>
-Удостоверьтесь, что все настройки верны и нажмите клавишу <em>OK</em>.
+Нажмите кнопку <em>Ок</em>, чтобы выполнить импорт.
 </p>
 </li>
 </ul></div>
-<div class="paragraph"><p>Журнал погружения APD должен появиться в <em>Subsurface</em>.</p></div>
+<div class="paragraph"><p>Журнал погружения APD должен появиться в <em>Subsurface</em>. Деко-потолок, сгенерированный Inspiration,
+можно посмотреть на профиле, выбрав соответствующую кнопку на панели слева от профиля погружения.
+Оборудование APD не записывает данные о давлении в баллонах, но вы можете указать их самостоятельно
+на вкладке <em>Снаряжение</em>.</p></div>
 </div>
 </div>
 </div>
 <div class="sect1">
-<h2 id="APPENDIX_C">17. ПРИЛОЖЕНИЕ В: Экспорт журнала погружений из сторонних программ</h2>
+<h2 id="APPENDIX_C">17. ПРИЛОЖЕНИЕ В: Импорт журнала погружений из сторонних программ</h2>
 <div class="sectionbody">
 <div class="paragraph"><p>Импорт погружений из сторонних программ ведения журналов достаточно прост и
 выполняется с помощью универсального импорта, доступного из главного
@@ -5036,7 +5303,7 @@ UDDF-файл для каждого погружения. Выделите вс
 <div class="paragraph"><p>В этом приложении мы попытаемся рассказать как экспортировать погружения из
 сторонних программ. В большей части это касается Linux и Windows.</p></div>
 <div class="sect2">
-<h3 id="S_ImportingDivesSuunto">17.1. Экспорт погружений из <strong>Suunto Divemanager (DM3 и DM4)</strong></h3>
+<h3 id="S_ImportingDivesSuunto">17.1. Экспорт погружений из <strong>Suunto Divemanager (DM3,DM4 и DM5)</strong></h3>
 <div class="admonitionblock">
 <table><tr>
 <td class="icon">
@@ -5189,14 +5456,11 @@ UDDF-файл для каждого погружения. Выделите вс
 </ol></div>
 </div>
 <div class="sect2">
-<<<<<<< HEAD
-<h3 id="_экспорт_погружений_из_mares_dive_organiser_v2_1">17.2. Экспорт погружений из Mares Dive Organiser V2.1</h3>
-=======
 <h3 id="_экспорт_погружений_из_atomic_logbook">17.2. Экспорт погружений из Atomic Logbook</h3>
 <div class="admonitionblock" id="Atomic_Export">
 <table><tr>
 <td class="icon">
-<img src="./images/icons/note.png" alt="Замечание" />
+<img src="images/icons/atomiclogo.jpg" alt="Замечание" />
 </td>
 <td class="content">Компания Atomic Aquatics предлагает собственное программное обеспечение Atomic Logbook для платформы
 Windows. Оно позволяет загружать журналы погружений с компьютеров Cobalt и Cobalt 2. Журнал хранится
@@ -5207,7 +5471,6 @@ Windows. Оно позволяет загружать журналы погру
 </div>
 <div class="sect2">
 <h3 id="_экспорт_погружений_из_mares_dive_organiser_v2_1">17.3. Экспорт погружений из Mares Dive Organiser V2.1</h3>
->>>>>>> v4.4-branch
 <div class="admonitionblock" id="Mares_Export">
 <table><tr>
 <td class="icon">
@@ -5248,32 +5511,37 @@ Windows. Оно позволяет загружать журналы погру
 </ol></div>
 </div>
 <div class="sect2">
-<<<<<<< HEAD
-<h3 id="S_ImportingDivinglog">17.3. Экспорт погружений из <strong>DivingLog 5.0</strong></h3>
-=======
-<h3 id="S_ImportingDivinglog">17.4. Экспорт погружений из <strong>DivingLog 5.0</strong></h3>
->>>>>>> v4.4-branch
+<h3 id="S_ImportingDivinglog">17.4. Экспорт погружений из <strong>DivingLog 5.0 и 6.0</strong></h3>
 <div class="admonitionblock">
 <table><tr>
 <td class="icon">
 <img src="images/icons/divingloglogo.jpg" alt="Замечание" />
 </td>
-<td class="content">К сожалению XML-файлы DivingLog не дают нам никакой информации о том, в какой
-системе мер они сохранены. Поэтому для успешного импорта в <em>Subsurface</em> вам
-необходимо изменить настройки DivingLog так, чтобы использовалась метрическая
-система мер (в главном меню выберите <em>File &#8594; Preferences &#8594; Units and
-Language</em> и нажмите кнопку <em>Metric</em>). Затем выполните следующие шаги:</td>
+<td class="content">Лучший способ перенести журнал погружений из DivingLog в <em>Subsurface</em> - полная конвертация базы
+данных. Прочие форматы не содержат все детали погружений, такие как события замены газов, единицы
+измерения и т.п. При конвертации базы данных, вся эта информация будет доступна.</td>
 </tr></table>
 </div>
+<div class="paragraph"><p>Для переноса всех файлов из DivingLog в <em>Subsurface</em> выполните следующие шаги:</p></div>
 <div class="olist arabic"><ol class="arabic">
 <li>
 <p>
-В главном меню выберите <em>File &#8594; Export &#8594; XML</em>
+В главном меню DivingLog выберите <em>File &#8594; Export &#8594; SQLite</em>
 </p>
 </li>
 <li>
 <p>
-Выберите какие погружения нужно экспортировать
+Нажмите на кнопку <em>Установки</em>
+</p>
+</li>
+<li>
+<p>
+Установите <em>RTF2Plaintext</em> в значение <em>true</em>
+</p>
+</li>
+<li>
+<p>
+Закройте диалоговое окно <em>Установки</em>
 </p>
 </li>
 <li>
@@ -5282,19 +5550,12 @@ Language</em> и нажмите кнопку <em>Metric</em>). Затем вып
 </p>
 </li>
 </ol></div>
+<div class="paragraph"><p>После выполнения этих шагов, откройте сохраненный файл с помощью <em>Subsurface</em>, все погружения будут
+преобразованы в наш собственный формат. Последним шагом не забудьте сохранить журнал.</p></div>
 </div>
 </div>
 </div>
 <div class="sect1">
-<<<<<<< HEAD
-<h2 id="_приложение_г_частые_вопросы_и_ответы">18. ПРИЛОЖЕНИЕ Г: Частые вопросы и ответы</h2>
-<div class="sectionbody">
-<div class="sect2">
-<h3 id="_похоже_что_em_subsurface_em_неправильно_считает_расход_газов_и_sac">18.1. Похоже, что <em>Subsurface</em> неправильно считает расход газов и SAC</h3>
-<div class="paragraph" id="SAC_CALCULATION"><p><em>Вопрос</em>: Я погружался с баллоном 12.2л, начальное давление 220бар, конечное -
-100 бар. Мои расчеты SAC не совпадают со значением в <em>Subsurface</em>. Возможно
-ли, что <em>Subsurface</em> считает неверно?</p></div>
-=======
 <h2 id="S_Appendix_D">18. ПРИЛОЖЕНИЕ Г: Экспорт электронных таблиц в CSV-формат</h2>
 <div class="sectionbody">
 <div class="paragraph"><p>Многие дайверы ведут журнал погружений в каком-либо электронном формате, зачастую в виде таблицы
@@ -5320,7 +5581,7 @@ Language</em> и нажмите кнопку <em>Metric</em>). Затем вып
 </li>
 <li>
 <p>
-Система мер. Нужно использовать только одну систему (т.е. нельзя импользовать фунты и градусы Цельсия)
+Система мер. Нужно использовать только одну систему (т.е. нельзя использовать фунты и градусы Цельсия)
 </p>
 </li>
 <li>
@@ -5426,13 +5687,322 @@ GPS-координаты. Следует использоваться десят
 </div>
 </div>
 <div class="sect1">
-<h2 id="_приложение_д_частые_вопросы_и_ответы">19. ПРИЛОЖЕНИЕ Д: Частые вопросы и ответы</h2>
+<h2 id="S_APPENDIX_E">19. ПРИЛОЖЕНИЕ Д: Создание собственных шаблонов печати</h2>
+<div class="sectionbody">
+<div class="paragraph"><p><em>Subsurface</em> предоставляет механизм по созданию и изменению шаблонов для печати погружений, что
+позволяет гибко менять положение информации на странице. Шаблоны используют HTML и набор инструкций
+библиотеки Grantlee.</p></div>
+<div class="paragraph"><p>Доступ к шаблонам осуществляется из диалога печати (см. рисунок В ниже).</p></div>
+<div class="imageblock" style="text-align:center;">
+<div class="content">
+<img src="images/Print1_f22.jpg" alt="Рисунок: Диалог печати" />
+</div>
+</div>
+<div class="paragraph"><p>Кнопки под выпадающим списком шаблонов позволяют <em>Редактировать</em>, <em>Удалить</em>, выполнить <em>Импорт</em> и
+<em>Экспорт</em>. Новые или измененные шаблоны хранятся в той же директории, что и журнал, с которым вы работаете
+в данный момент. Чтобы создать новый шаблон, выберите в списке <em>Собственный</em> шаблон и нажмите
+кнопку <em>Редактировать</em>.</p></div>
+<div class="paragraph"><p>Окно редактирования шаблона состоит из трех вкладок:</p></div>
+<div class="imageblock" style="text-align:center;">
+<div class="content">
+<img src="images/Template1_f22.jpg" alt="Рисунок: окно редактирования шаблона" />
+</div>
+</div>
+<div class="paragraph"><p>1) Вкладка <em>Стиль</em> (рисунок <strong>А</strong> выше) управляет шрифтами, междстрочным интервалом и палитрой цветов.</p></div>
+<div class="paragraph"><p>2) Вкладка <em>Цвета</em> (рисунок <strong>В</strong> выше) позволяет переопределить цвета шаблона</p></div>
+<div class="paragraph"><p>3) Вкладка <em>Шаблон</em> (рисунок ниже) дает вам возможность описать шаблон на языке HTML с использованием
+   примитивов библиотеки Grantlee.</p></div>
+<div class="imageblock" style="text-align:center;">
+<div class="content">
+<img src="images/Template2_f22.jpg" alt="Рисунок: Вкладка редактирования шаблона" />
+</div>
+</div>
+<div class="paragraph"><p>Вы можете адаптировать существующие шаблоны под свои нужды и сохранить их в директории журнала погружений.</p></div>
+<div class="paragraph"><p>Чтобы шаблон правильно отображался, в нем должны присутствовать следующие элементы:</p></div>
+<div class="sect2">
+<h3 id="_главный_цикл_погружений">19.1. Главный цикл погружений</h3>
+<div class="paragraph"><p><em>Subsurface</em> экспортирует в <em>Grantlee</em> список погружений под именем <strong>dives</strong>. Для итерации по погружениям:</p></div>
+<div class="literalblock">
+<div class="title">template.html</div>
+<div class="content">
+<pre><code>        {% for dive in dives %}
+                &lt;h1&gt; {{ dive.number }} &lt;/h1&gt;
+        {% endfor %}</code></pre>
+</div></div>
+<div class="literalblock">
+<div class="title">output.html</div>
+<div class="content">
+<pre><code>        &lt;h1&gt; 1 &lt;/h1&gt;
+        &lt;h1&gt; 2 &lt;/h1&gt;
+        &lt;h1&gt; 3 &lt;/h1&gt;</code></pre>
+</div></div>
+<div class="paragraph"><p>Дополнительную информация о <em>Grantlee</em> вы можете найти <a href="http://www.grantlee.org/apidox/for_themers.html">здесь</a>.</p></div>
+</div>
+<div class="sect2">
+<h3 id="_переменные_доступные_в_grantlee">19.2. Переменные, доступные в Grantlee</h3>
+<div class="paragraph"><p><em>Subsurface</em> экспортирует только часть информации о погружении:</p></div>
+<div class="tableblock">
+<table rules="all"
+width="100%"
+frame="border"
+cellspacing="0" cellpadding="4">
+<col width="50%" />
+<col width="50%" />
+<tbody>
+<tr>
+<td align="left" valign="top"><p class="table"><strong>Название</strong></p></td>
+<td align="left" valign="top"><p class="table"><strong>Описание</strong></p></td>
+</tr>
+<tr>
+<td align="left" valign="top"><p class="table">number</p></td>
+<td align="left" valign="top"><p class="table">(<strong>int</strong>) номер погружения</p></td>
+</tr>
+<tr>
+<td align="left" valign="top"><p class="table">id</p></td>
+<td align="left" valign="top"><p class="table">(<strong>int</strong>) уникальный ID дайва, должен использоваться для получения профиляe</p></td>
+</tr>
+<tr>
+<td align="left" valign="top"><p class="table">date</p></td>
+<td align="left" valign="top"><p class="table">(<strong>string</strong>) дата погружения</p></td>
+</tr>
+<tr>
+<td align="left" valign="top"><p class="table">time</p></td>
+<td align="left" valign="top"><p class="table">(<strong>string</strong>) время погружения</p></td>
+</tr>
+<tr>
+<td align="left" valign="top"><p class="table">location</p></td>
+<td align="left" valign="top"><p class="table">(<strong>string</strong>) местоположение</p></td>
+</tr>
+<tr>
+<td align="left" valign="top"><p class="table">duration</p></td>
+<td align="left" valign="top"><p class="table">(<strong>string</strong>) длительность</p></td>
+</tr>
+<tr>
+<td align="left" valign="top"><p class="table">depth</p></td>
+<td align="left" valign="top"><p class="table">(<strong>string</strong>) глубина погружения</p></td>
+</tr>
+<tr>
+<td align="left" valign="top"><p class="table">divemaster</p></td>
+<td align="left" valign="top"><p class="table">(<strong>string</strong>) информация о дайв-мастере</p></td>
+</tr>
+<tr>
+<td align="left" valign="top"><p class="table">buddy</p></td>
+<td align="left" valign="top"><p class="table">(<strong>string</strong>) информация о партнерах</p></td>
+</tr>
+<tr>
+<td align="left" valign="top"><p class="table">airTemp</p></td>
+<td align="left" valign="top"><p class="table">(<strong>string</strong>) температура воздуха</p></td>
+</tr>
+<tr>
+<td align="left" valign="top"><p class="table">waterTemp</p></td>
+<td align="left" valign="top"><p class="table">(<strong>string</strong>) температура воды</p></td>
+</tr>
+<tr>
+<td align="left" valign="top"><p class="table">notes</p></td>
+<td align="left" valign="top"><p class="table">(<strong>string</strong>) примечания к погружению</p></td>
+</tr>
+<tr>
+<td align="left" valign="top"><p class="table">rating</p></td>
+<td align="left" valign="top"><p class="table">(<strong>int</strong>) рейтинг погружения (от 0 до 5)</p></td>
+</tr>
+<tr>
+<td align="left" valign="top"><p class="table">sac</p></td>
+<td align="left" valign="top"><p class="table">(<strong>string</strong>) значение SAC</p></td>
+</tr>
+<tr>
+<td align="left" valign="top"><p class="table">tags</p></td>
+<td align="left" valign="top"><p class="table">(<strong>string</strong>) все метки погружения, перечисленные через запятую</p></td>
+</tr>
+<tr>
+<td align="left" valign="top"><p class="table">gas</p></td>
+<td align="left" valign="top"><p class="table">(<strong>string</strong>) используемые баллоны</p></td>
+</tr>
+</tbody>
+</table>
+</div>
+<div class="paragraph"><p><em>Subsurface</em> также экспортирует структуру <strong>template_options</strong>. Эти данные должны использоваться
+в определении стилей CSS. В таблице ниже приведены доступные переменные:</p></div>
+<div class="tableblock">
+<table rules="all"
+width="100%"
+frame="border"
+cellspacing="0" cellpadding="4">
+<col width="50%" />
+<col width="50%" />
+<tbody>
+<tr>
+<td align="left" valign="top"><p class="table"><strong>Название</strong></p></td>
+<td align="left" valign="top"><p class="table"><strong>Описание</strong></p></td>
+</tr>
+<tr>
+<td align="left" valign="top"><p class="table">font</p></td>
+<td align="left" valign="top"><p class="table">(<strong>string</strong>) семество шрифтов</p></td>
+</tr>
+<tr>
+<td align="left" valign="top"><p class="table">borderwidth</p></td>
+<td align="left" valign="top"><p class="table">(<strong>int</strong>) значение border-width динамически высчитывается как 0.1% от ширины страницы, минимум 1px</p></td>
+</tr>
+<tr>
+<td align="left" valign="top"><p class="table">font_size</p></td>
+<td align="left" valign="top"><p class="table">(<strong>double</strong>) размер шрифта в vw (viewport width), в диапазоне от 1.0 до 2.0</p></td>
+</tr>
+<tr>
+<td align="left" valign="top"><p class="table">line_spacing</p></td>
+<td align="left" valign="top"><p class="table">(<strong>double</strong>) расстояние между строками, диапазон от 1.0 до 3.0</p></td>
+</tr>
+<tr>
+<td align="left" valign="top"><p class="table">color1</p></td>
+<td align="left" valign="top"><p class="table">(<strong>string</strong>) цвет фона</p></td>
+</tr>
+<tr>
+<td align="left" valign="top"><p class="table">color2</p></td>
+<td align="left" valign="top"><p class="table">(<strong>string</strong>) основной цвет ячейки таблицы</p></td>
+</tr>
+<tr>
+<td align="left" valign="top"><p class="table">color3</p></td>
+<td align="left" valign="top"><p class="table">(<strong>string</strong>) дополнительный цвет ячейки таблицы</p></td>
+</tr>
+<tr>
+<td align="left" valign="top"><p class="table">color4</p></td>
+<td align="left" valign="top"><p class="table">(<strong>string</strong>) основной цвет текста</p></td>
+</tr>
+<tr>
+<td align="left" valign="top"><p class="table">color5</p></td>
+<td align="left" valign="top"><p class="table">(<strong>string</strong>) дополнительный цвет текста</p></td>
+</tr>
+<tr>
+<td align="left" valign="top"><p class="table">color6</p></td>
+<td align="left" valign="top"><p class="table">(<strong>string</strong>) цвет рамки</p></td>
+</tr>
+</tbody>
+</table>
+</div>
+<div class="literalblock">
+<div class="title">template.html</div>
+<div class="content">
+<pre><code>        border-width: {{ template_options.borderwidth }}px;</code></pre>
+</div></div>
+<div class="literalblock">
+<div class="title">output.html</div>
+<div class="content">
+<pre><code>        border-width: 3px;</code></pre>
+</div></div>
+<div class="paragraph"><p>Дополнительно <em>Subsurface</em> экспортирует переменную <strong>print_options</strong>. У этой переменной одно поле.</p></div>
+<div class="tableblock">
+<table rules="all"
+width="100%"
+frame="border"
+cellspacing="0" cellpadding="4">
+<col width="50%" />
+<col width="50%" />
+<tbody>
+<tr>
+<td align="left" valign="top"><p class="table"><strong>Название</strong></p></td>
+<td align="left" valign="top"><p class="table"><strong>Описание</strong></p></td>
+</tr>
+<tr>
+<td align="left" valign="top"><p class="table">grayscale</p></td>
+<td align="left" valign="top"><p class="table">Используйте <em>CSS</em> фильтры для преобразования страницы в черно-белый цвет (необходимо добавлять в стиль body, чтобы сделать возможной черно-белую печать)</p></td>
+</tr>
+</tbody>
+</table>
+</div>
+<div class="literalblock">
+<div class="title">template.html</div>
+<div class="content">
+<pre><code>        body {
+                {{ print_options.grayscale }};
+        }</code></pre>
+</div></div>
+<div class="literalblock">
+<div class="title">output.html</div>
+<div class="content">
+<pre><code>        body {
+                -webkit-filter: grayscale(100%);
+        }</code></pre>
+</div></div>
+</div>
+<div class="sect2">
+<h3 id="_определенные_css_селекторы">19.3. Определенные CSS-селекторы</h3>
+<div class="paragraph"><p>Так как профиль погружения добавляется после рендеринга, <em>Subsurface</em> использует специальные <em>CSS</em>-селекторы
+для поиска в сгенерированном HTML. Вам понадобится добавить селекторы из табдицы ниже.</p></div>
+<div class="tableblock">
+<table rules="all"
+width="100%"
+frame="border"
+cellspacing="0" cellpadding="4">
+<col width="33%" />
+<col width="33%" />
+<col width="33%" />
+<tbody>
+<tr>
+<td align="left" valign="top"><p class="table"><strong>Селектор</strong></p></td>
+<td align="left" valign="top"><p class="table"><strong>Тип</strong></p></td>
+<td align="left" valign="top"><p class="table"><strong>Описание</strong></p></td>
+</tr>
+<tr>
+<td align="left" valign="top"><p class="table">dive_{{ dive.id }}</p></td>
+<td align="left" valign="top"><p class="table">id</p></td>
+<td align="left" valign="top"><p class="table">используется для получения соответствующего профиля погружения</p></td>
+</tr>
+<tr>
+<td align="left" valign="top"><p class="table">diveProfile</p></td>
+<td align="left" valign="top"><p class="table">class</p></td>
+<td align="left" valign="top"><p class="table">каждый div-элемент, содержащий профиль, должен иметь этот селектор класса в дополнение к dive_{{ dive.id }} id-селектору</p></td>
+</tr>
+<tr>
+<td align="left" valign="top"><p class="table">dontbreak</p></td>
+<td align="left" valign="top"><p class="table">class</p></td>
+<td align="left" valign="top"><p class="table">предотвращает div с этим классом от разбиаения на две страницы, может быть использован только в потоковых шаблонах (когда data-numberofdives = 0)</p></td>
+</tr>
+</tbody>
+</table>
+</div>
+</div>
+</div>
+</div>
+<div class="sect1">
+<h2 id="_приложение_е_частые_вопросы_и_ответы">20. ПРИЛОЖЕНИЕ Е: Частые вопросы и ответы</h2>
+<div class="sectionbody">
+<div class="paragraph"><p>ВАЖНО: Отображение профиля погружения не поддерживается в потоковых шаблонах (когда data-numberofdives = 0)</p></div>
+<div class="sect2">
+<h3 id="_специальные_атрибуты">20.1. Специальные атрибуты</h3>
+<div class="paragraph"><p>Существует два способа рендеринга - указанное количество погружений на странице и потоковое отображение
+(_Subsurface пытается разместить как можно больще погружений на странице).</p></div>
+<div class="paragraph"><p>Атрибут <strong>data-numberofdives</strong> указывает сколько погружений должно быть отображено на странице</p></div>
+<div class="ulist"><ul>
+<li>
+<p>
+отобразить 6 погружений на странице:
+</p>
+</li>
+</ul></div>
+<div class="literalblock">
+<div class="content">
+<pre><code>        &lt;body data-numberofdives = 6&gt;</code></pre>
+</div></div>
+<div class="ulist"><ul>
+<li>
+<p>
+отобразаить как можно больше погружений:
+</p>
+</li>
+</ul></div>
+<div class="literalblock">
+<div class="content">
+<pre><code>        &lt;body data-numberofdives = 0&gt;</code></pre>
+</div></div>
+<div class="paragraph"><p>ВАЖНО: Все размеры CSS должны быть в относительных единицах, чтобы поддерживать печать на бумаге любого размера.</p></div>
+</div>
+</div>
+</div>
+<div class="sect1">
+<h2 id="_приложение_е_чаво">21. ПРИЛОЖЕНИЕ Е: ЧаВо</h2>
 <div class="sectionbody">
 <div class="sect2">
-<h3 id="_похоже_что_em_subsurface_em_неправильно_считает_расход_газов_и_sac">19.1. Похоже, что <em>Subsurface</em> неправильно считает расход газов и SAC</h3>
+<h3 id="S_APPENDIX_F">21.1. Похоже, что <em>Subsurface</em> неправильно считает расход газов и SAC</h3>
 <div class="paragraph" id="SAC_CALCULATION"><p><em>Вопрос</em>: Я погружался с баллоном 12.2л, начальное давление 220бар, конечное - 100 бар. Мои расчеты
 SAC не совпадают со значением в <em>Subsurface</em>. Возможно ли, что <em>Subsurface</em> считает неверно?</p></div>
->>>>>>> v4.4-branch
 <div class="paragraph"><p><em>Ответ</em>: Нет. <em>Subsurface</em> рассчитывает расход газа иначе, и даже лучше, чем вы
 ожидаете. В частности, мы принимаем во внимание несжимаемость газа.
 Традиционно, расход и SAC считаются по формуле:
@@ -5459,23 +6029,32 @@ SAC не совпадают со значением в <em>Subsurface</em>. Во
 воздух ведет себя почти как идеальный газ.</p></div>
 </div>
 <div class="sect2">
-<<<<<<< HEAD
-<h3 id="_на_некоторых_профилях_наблюдаются_различия_во_времени_с_данных_дайв_компьютера_8230">18.2. На некоторых профилях наблюдаются различия во времени с данных дайв-компьютера&#8230;</h3>
-=======
-<h3 id="_на_некоторых_профилях_наблюдаются_различия_во_времени_с_данных_дайв_компьютера_8230">19.2. На некоторых профилях наблюдаются различия во времени с данных дайв-компьютера&#8230;</h3>
->>>>>>> v4.4-branch
-<div class="paragraph"><p><em>Subsurface</em> игнорирует поверхностное время при различных расчетах (средняя
-глубина, время дайва, SAC и т.д)</p></div>
-<div class="paragraph"><p><em>Вопрос</em>: почему время погружения на дайв-компьютере и в <em>Subsurface</em> различаются?</p></div>
-<div class="paragraph"><p><em>Ответ</em>: Например, вы решили выполнить проверку плавучести (достаточно
-глубокую, чтобы компьютер посчитал это началом погружения), после чего всплыли
-на поверхность и еще 5 минут прождали своего напарника. Ваш дайв-компьютер
-может посчитать длительность этого погружения 50 минут, потому что компьютер
-находится в режиме погружения, а <em>Subsurface</em> посчитает длительность этого
-дайва равной 45 минутам, потому что вы действительно погружались 45 минут.
+<h3 id="_на_некоторых_профилях_наблюдаются_различия_во_времени_с_данных_дайв_компьютера_8230">21.2. На некоторых профилях наблюдаются различия во времени с данных дайв-компьютера&#8230;</h3>
+<div class="paragraph"><p><em>Subsurface</em> игнорирует поверхностное время при различных расчетах (средняя глубина, время дайва, SAC и т.д)
+<em>Вопрос</em>: почему время погружения на дайв-компьютере и в <em>Subsurface</em> различаются?</p></div>
+<div class="paragraph"><p><em>Ответ</em>: Например, вы решили выполнить проверку плавучести (достаточно глубокую, чтобы
+компьютер посчитал это началом погружения), после чего всплыли на поверхность и еще 5 минут
+прождали своего напарника. Ваш дайв-компьютер может посчитать длительность этого погружения
+50 минут, потому что компьютер находится в режиме погружения, а <em>Subsurface</em> посчитает
+длительность этого дайва равной 45 минутам, потому что вы действительно погружались 45 минут.
 Особенно это заметно, если вы обучаете новичков OW, вы долгое время находитесь
-в воде, но основное время проводите на поверхности. И это нельзя считать
-долгим погружением.</p></div>
+в воде, но основное время проводите на поверхности. И это нельзя считать долгим погружением.</p></div>
+</div>
+<div class="sect2">
+<h3 id="_при_загрузке_отсутствуют_некоторые_погружения">21.3. При загрузке отсутствуют некоторые погружения</h3>
+<div class="paragraph" id="DC_HISTORY"><p><em>Вопрос</em>: У меня не получается загрузить все мои погружения, только недавние. При этом руководство
+по моему дайв-компьютеру утверждает, что он хранит историю ,например, 999 погружений.</p></div>
+<div class="paragraph"><p><em>Ответ</em>: История погружений и профиль погружения - две большие разницы. История
+хранит только общее количество погружений и общее время, проведенное под водой.
+С другой стороны, журнал хранит профили погружений, но объем его памяти
+ограничен. Точно количество хранимых профилей зависит от частоты дискретизации
+и длительности погружений. Как только память переполняется, старые погружения
+перетираются новыми. Поэтому мы можем загрузить последний 13, 30 или 199
+погружений.</p></div>
+<div class="paragraph"><p>Если вы выгрузили погружения в разные программы для ведения журналов перед тем как они были
+перезаписаны, есть вероятность, что <em>Subsurface</em> сможет импортировать их. Однако, если погружения
+были только в вашем дайв-компьютере, они не могут быть восстановлены после того как были
+перезаписаны новыми погружениями.</p></div>
 </div>
 </div>
 </div>
@@ -5483,11 +6062,7 @@ SAC не совпадают со значением в <em>Subsurface</em>. Во
 <div id="footnotes"><hr /></div>
 <div id="footer">
 <div id="footer-text">
-<<<<<<< HEAD
-Последнее обновление 2015-02-04 13:41:50 PST
-=======
-Последнее обновление 2015-02-17 08:49:01 PST
->>>>>>> v4.4-branch
+Последнее обновление 2015-10-09 13:12:59 PDT
 </div>
 </div>
 </body>
