Merge branch 'v4.4-branch' back into master

The manuals all will need a careful read. The changes to use lsb-release and the PCLinuxOS specific files got lost because I didn't want to try to rewite this in the middle of a merge. Signed-off-by: Dirk Hohndel <dirk@hohndel.org> Conflicts: Documentation/50-pot/subsurface-manual.pot Documentation/fr/po/subsurface-manual.fr.po Documentation/user-manual.txt Documentation/user-manual_es.txt Documentation/user-manual_fr.html.git Documentation/user-manual_fr.txt Documentation/user-manual_ru.html.git Documentation/user-manual_ru.txt file.c qthelper.cpp subsurface.pro subsurfacesysinfo.cpp xslt/DiveLog.xslt
author: Dirk Hohndel <dirk@hohndel.org> 2015-02-18 21:33:00 -0800
committer: Dirk Hohndel <dirk@hohndel.org> 2015-02-19 19:44:37 -0800
commit: f1f02941c7a8e538db18e10f4937170024d3405e (patch)
tree: 708cafb2bb85f373d2729fe3ed52a6d4c8025aee /Documentation/user-manual_fr.html.git
parent: aa7f2eeb8a1a46211b52b9c97e3f040c2f1a5ab8 (diff)
parent: 554b652d25d9ce853c4f8f2044f80ab1b198fb1b (diff)
download: subsurface-f1f02941c7a8e538db18e10f4937170024d3405e.tar.gz
1 files changed, 590 insertions, 684 deletions
diff --git a/Documentation/user-manual_fr.html.git b/Documentation/user-manual_fr.html.git
index 56d4c1ba7..f1411e0cf 100644
--- a/Documentation/user-manual_fr.html.git
+++ b/Documentation/user-manual_fr.html.git
@@ -521,31 +521,31 @@ plongées du journal (carnet) de plongées de l&#8217;utilisateur. Une plongée
 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
+<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 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
-plus d&#8217;une plongée est mise en surbrillance seule 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_f20.jpg" alt="The Main Window" />
+plus d&#8217;une plongée est mise en surbrillance seule 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_f20.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
@@ -636,26 +636,26 @@ Import from spreadsheet or CSV files containing dive profiles.
 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_f20.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
-<em>Notes</em> 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" />
+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_f20.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
+<em>Notes</em> 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" />
 </div>
 </div>
 <div class="paragraph"><p>The <em>Save</em> button should only be selected after all the parts of a dive have
@@ -663,20 +663,20 @@ been entered.  When entering dives by hand, the <em>Info</em>, <em>Equipment</em
 <em>Profile</em> tabs should be completed before saving the information. By
 selecting the <em>Save</em> button, a local copy of the information for this
 specific dive is saved in memory. When one closes Subsurface, the program
-will ask again, this time whether the complete dive log should be saved on
-disk or not.</p></div>
-<div class="sect3">
-<h4 id="_notes">5.1.1. 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>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 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
+will ask again, this time whether the complete dive log should be saved on
+disk or not.</p></div>
+<div class="sect3">
+<h4 id="_notes">5.1.1. 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>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 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
@@ -723,20 +723,20 @@ The coordinates can be entered by hand if they are known, using one of four
 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
+</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>
@@ -762,16 +762,16 @@ training, cave etc. <em>Subsurface</em> has many built-in tags. Auto completion
 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 Notes panel:</p></div>
-<div class="imageblock" style="text-align:center;">
-<div class="content">
-<img src="images/CompletedDiveInfo_f20.jpg" alt="FIGURE: A completed Notes tab" />
-</div>
-</div>
-</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 Notes panel:</p></div>
+<div class="imageblock" style="text-align:center;">
+<div class="content">
+<img src="images/CompletedDiveInfo_f20.jpg" alt="FIGURE: A completed 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
@@ -911,19 +911,19 @@ EAN50.</p></div>
 <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>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 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>
-</div>
-<div class="sect2">
+</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>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 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>
+</div>
+<div class="sect2">
 <h3 id="S_ImportDiveComputer">5.2. Importing new dive information from a Dive Computer</h3>
 <div class="sect3">
 <h4 id="_connecting_and_importing_data_from_a_dive_computer">5.2.1. Connecting and importing data from a dive computer.</h4>
@@ -992,13 +992,13 @@ In <em>Subsurface</em>, from the Main Menu, the user must select <em>Import &#85
 though these dives have already been imported to <em>Subsurface</em>. For that
 reason, if the divecomputer allows this, <em>Subsurface</em> only imports dives
 that have not been uploaded before. This makes the download process faster
-on most dive computers and also saves battery power of the dive computer (at
-least for those not charging while connected via USB).  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>
-<div class="ulist"><ul>
-<li>
+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>
+<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,
@@ -1191,28 +1191,28 @@ 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.3. Updating the dive information imported from the dive computer.</h4>
-<div class="paragraph"><p>With the uploaded dives in the <strong>Dive List</strong>, the information from the dive
-computer is not complete and more details must be added in order to have a
-fuller record of the dives. To do this, the <strong>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="_notes_2">5.2.4. Notes</h4>
-<div class="paragraph"><p>The date and time of the dive, gas mixture and (often) water temperature are
-usually shown as obtained from the dive computer, but the user needs to add
-additional information by hand in order to have a more complete dive
-record. In a few cases, (e.g. APD rebreathers) one also has to provide the
-date and time of the dive.  If the contents of this tab is changed or edited
-in any way, the message in a blue box at the top of the panel indicates that
-the dive is being edited. If one clicks on the <strong>Notes</strong> tab, the following
-fields are visible:</p></div>
-<div class="imageblock" style="text-align:center;">
-<div class="content">
-<img src="images/AddDive3_f20.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 the
+<h4 id="S_EditDiveInfo">5.2.3. Updating the dive information imported from the dive computer.</h4>
+<div class="paragraph"><p>With the uploaded dives in the <strong>Dive List</strong>, the information from the dive
+computer is not complete and more details must be added in order to have a
+fuller record of the dives. To do this, the <strong>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="_notes_2">5.2.4. Notes</h4>
+<div class="paragraph"><p>The date and time of the dive, gas mixture and (often) water temperature are
+usually shown as obtained from the dive computer, but the user needs to add
+additional information by hand in order to have a more complete dive
+record. In a few cases, (e.g. APD rebreathers) one also has to provide the
+date and time of the dive.  If the contents of this tab is changed or edited
+in any way, the message in a blue box at the top of the panel indicates that
+the dive is being edited. If one clicks on the <strong>Notes</strong> tab, the following
+fields are visible:</p></div>
+<div class="imageblock" style="text-align:center;">
+<div class="content">
+<img src="images/AddDive3_f20.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 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
@@ -1302,16 +1302,16 @@ 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 Notes panel:</p></div>
-<div class="imageblock" style="text-align:center;">
-<div class="content">
-<img src="images/CompletedDiveInfo_f20.jpg" alt="FIGURE: A completed Notes tab" />
-</div>
-</div>
-</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 Notes panel:</p></div>
+<div class="imageblock" style="text-align:center;">
+<div class="content">
+<img src="images/CompletedDiveInfo_f20.jpg" alt="FIGURE: A completed Notes tab" />
+</div>
+</div>
+</div>
 <div class="sect3">
 <h4 id="_equipment_2">5.2.5. Equipment</h4>
 <div class="paragraph"><p>The Equipment tab allows one to enter information about the type of cylinder
@@ -1319,19 +1319,19 @@ 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" />
-</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 (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>
+<img src="images/BlueEditBar_f20.jpg" alt="FIGURE: Blue edit bar" />
+</div>
+</div>
+<div class="paragraph"><p>indicates that the dive is being edited. This is a highly interactive part
+of <em>Subsurface</em> and the information on cylinders and gases (entered here)
+determines the behaviour of the dive profile (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>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<br />
 button at the top right allows the user to add more cylinders for this
@@ -1403,43 +1403,43 @@ weights: integrated as well as a weight belt:</p></div>
 </div>
 </div>
 <div class="sect3">
-<h4 id="_editing_several_selected_dives_simultaneously">5.2.6. Editing several selected dives simultaneously</h4>
-<div class="paragraph"><p><em>METHOD 1</em>: After uploading dives from a dive computer, the dive profiles of
-the uploaded dives are shown in the <strong>Dive profile</strong> tab, as well as a few
-items of information 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
+<h4 id="_editing_several_selected_dives_simultaneously">5.2.6. Editing several selected dives simultaneously</h4>
+<div class="paragraph"><p><em>METHOD 1</em>: After uploading dives from a dive computer, the dive profiles of
+the uploaded dives are shown in the <strong>Dive profile</strong> tab, as well as a few
+items of information 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.7. Adding Bookmarks to a dive</h4>
+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.7. Adding Bookmarks to a dive</h4>
 <div class="paragraph"><p>Many divers wish to annotate their dives with text that indicate particular
 events during the dive, e.g. "Saw dolphins", or "Released surface
 buoy". This is easily done:</p></div>
@@ -1476,19 +1476,19 @@ If one hovers using the mouse over the red bookmark, the appropriate text is
 <img src="images/Bookmarks.jpg" alt="FIGURE: Bookmark dialog" />
 </div>
 </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>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>Save</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 retained. When the
-user exits <em>Subsurface</em> there is a final prompt to confirm that the new data
-should be saved.</p></div>
-</div>
-</div>
-<div class="sect2">
+</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>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>Save</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 retained. When the
+user exits <em>Subsurface</em> there is a final prompt to confirm that the new data
+should be saved.</p></div>
+</div>
+</div>
+<div class="sect2">
 <h3 id="_importing_dive_information_from_other_digital_data_sources_or_other_data_formats">5.3. Importing dive information from other digital data sources or other data formats</h3>
 <div class="paragraph" id="S_ImportingAlienDiveLogs"><p>If a user has been diving for some time, it is possible that several dives
 were logged using other dive log software. This information does not need
@@ -1717,18 +1717,18 @@ 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 instance, <em>Subsurface</em> expects
-the column heading for Dive number (" # ") to be "Dive # ". If the column
-heading that <em>Subsurface</em> expects is not in the blue cells, then drag the
-appropriate column heading from the upper area and drop it in the
-appropriate blue cell at the top of the table. To indicate the correct
-column for "Dive #", drag the ballooned item labeled "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;">
+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 instance, <em>Subsurface</em> expects
+the column heading for Dive number (" # ") to be "Dive # ". If the column
+heading that <em>Subsurface</em> expects is not in the blue cells, then drag the
+appropriate column heading from the upper area and drop it in the
+appropriate blue cell at the top of the table. To indicate the correct
+column for "Dive #", drag the ballooned item labeled "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>
@@ -1744,14 +1744,14 @@ in the <strong>Dive List</strong> panel.</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
+<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,
@@ -2307,13 +2307,13 @@ button in the tool bar to the left of the dive profile:</p></div>
 </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>Notes</strong> panel.
-</p>
-</li>
-<li>
+<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. See below:
@@ -2345,15 +2345,15 @@ the <em>Photos</em> tab (see text below).</p></div>
 </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
+<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
@@ -2373,86 +2373,40 @@ to the left of the <em>Dive Profile</em>), the program only shows a small white
 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>
-<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 (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 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 multicylinder 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>
-<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
-  <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
+be seen in the normal way.</p></div>
+</div>
+</div>
+<div class="sect2">
+<h3 id="_logging_special_types_of_dives">5.6. Logging special types of dives</h3>
+<div class="sect3">
+<h4 id="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 (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 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>During the dive, recording cylinder switch events</strong>. Since sidemount diving normally involves two
+  cylinders with air or with the same gas mixture, <em>Subsurface</em> distinguishes among these different
+  cylinders. In contrast, most dive computers that allow gas switching only distinguish among different
+  <em>gases</em> used, not among different <em>cylinders</em> used. This means that when sidemount dives are downloaded
+  from these dive computers, the events of switching between cylinders with the same gas are not downloaded. This may mean
+  that one may have to keep a written log of cylinder switch times using a slate, or (if the dive computer
+  has this facility) marking each cylinder switch with a bookmark that can be retrieved later. Returning
   from a dive with the information about cylinder changes is the only tricky part of logging sidemount dives.
 </p>
 </li>
-<li>
-<p>
-<strong>Within <em>Subsurface</em> describe the cylinders used during the dive</strong>. The diver needs to provide the
-  specifications of the different cylinders, using the <strong>Equipment</strong> tab of the <strong>Info Panel</strong> (see
-  image below where two 12 litre cylinder were used).
-</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
@@ -2461,77 +2415,29 @@ steps:</p></div>
   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>
+  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
+<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_CCR_dives">5.6.2. Closed circuit rebreather (CCR) dives</h4>
+<div class="admonitionblock">
+<table><tr>
+<td class="icon">
+<img src="images/APD.jpg" alt="Note" />
+</td>
+<td class="content">Closed system rebreathers use advanced technology to recirculate gas that
 has been breathed while doing two things to maintain a breathable oxygen
 concentration:
 a) remove carbon dioxide from the gas that has been exhaled
@@ -2655,13 +2561,13 @@ 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;">
+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_f20.jpg" alt="FIGURE: CCR dive profile" />
 </div>
@@ -2678,18 +2584,18 @@ B</a>.</p></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">
+<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
@@ -2778,20 +2684,20 @@ cellspacing="0" cellpadding="4">
 <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
+</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>
@@ -3128,17 +3034,17 @@ SAC is litres/min or cub ft/min.</td>
 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 equaling 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>
-</tr></table>
-</div>
-<div class="paragraph"><p>Figure (<strong>B</strong>) above shows an information box with a nearly complete set of
+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 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>
+</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>
@@ -3321,20 +3227,20 @@ 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 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 users 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 of the <strong>Trip Notes</strong> tab. The
-trip title in the <strong>Dive List</strong> panel should now reflect some of 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>
+<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 users 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 of the <strong>Trip Notes</strong> tab. The
+trip title in the <strong>Dive List</strong> panel should now reflect some of 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
@@ -3409,15 +3315,15 @@ should be forwards or backwards.</p></div>
 <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 such
-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" />
+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 such
+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>
@@ -3493,16 +3399,16 @@ 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>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>Notes</strong>
-panel of <em>Subsurface</em> (See image <strong>A</strong> below). Ensure that the dive that you
-want to transfer to the timeline is depicted in the <em>Subsurface</em> <strong>Dive
-Profile</strong> panel. Select the <em>Facebook</em> icon, and a dialogue is shown,
-determining the amount of additional information transferred with the dive
-profile (see image <strong>B</strong>, below). In order to transfer a dive profile to
-<em>Facebook</em>, the name of a <em>Facebook</em> album needs to be provided. The
+</div>
+</div>
+<div class="paragraph"><p>Having established a login to <em>Facebook</em>, transfer of a dive profile to
+one&#8217;s <em>Facebook</em> timeline is easy.  A <em>Facebook</em> icon appears in the <strong>Notes</strong>
+panel of <em>Subsurface</em> (See image <strong>A</strong> below). Ensure that the dive that you
+want to transfer to the timeline is depicted in the <em>Subsurface</em> <strong>Dive
+Profile</strong> panel. Select the <em>Facebook</em> icon, and a dialogue is shown,
+determining the amount of additional information transferred with the dive
+profile (see image <strong>B</strong>, below). In order to transfer a dive profile to
+<em>Facebook</em>, the name of a <em>Facebook</em> album needs to be provided. The
 checkboxes on the lefthand side allow one to determine how much additional
 information should be transferred with the dive profile. This information is
 shown in the text box on the right hand side of the panel (see image <strong>B</strong>,
@@ -3558,13 +3464,13 @@ Universal Dive Data Format (<em>UDDF</em>). Refer to <em>http://uddf.org</em> fo
   <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>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>
@@ -3895,13 +3801,13 @@ leave the settings panel by selecting <strong>OK</strong>.</p></div>
      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>Notes</strong> panel.
-</p>
-</li>
-<li>
+<li>
+<p>
+<strong>Default cylinder</strong>: Here users can 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
@@ -3967,22 +3873,22 @@ the dive profile:
 </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.
-</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
-   ascent.
-</p>
-<div class="ulist"><ul>
-<li>
-<p>
-<strong>Misc</strong>:
-</p>
+<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.
+</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
+   ascent.
+</p>
+<div class="ulist"><ul>
+<li>
+<p>
+<strong>Misc</strong>:
+</p>
 </li>
 </ul></div>
 </li>
@@ -4175,13 +4081,13 @@ A user who is not absolutely sure about any of the above requirements should
 <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
+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
@@ -4227,20 +4133,20 @@ In the top left-hand area of the planning screen, ensure that the constant
   atmospheric pressure can also be entered as an altitude in metres, assuming
   an atmospheric pressure of 1.013 bar.
 </p>
-</li>
-<li>
-<p>
-In the table labeled <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.
-</p>
-</li>
-<li>
+</li>
+<li>
+<p>
+In the table labeled <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.
+</p>
+</li>
+<li>
 <p>
 The dialogue indicating <em>Dive Planner Points</em> is usually not used at this
   stage of the dive planning.
@@ -4322,13 +4228,13 @@ BLUE to RED.</p></div>
 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 fulfill 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
+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 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
@@ -4356,13 +4262,13 @@ using EAN50 and using the settings as described above.</p></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
-diveplan</em> is requested, a detailed sentence-level explanation of the dive
-plan is given. If any of the management specifications have been exceeded
+<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
+diveplan</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
@@ -4399,19 +4305,19 @@ is not calculated, so gas consumptions of 0 litres are the norm.</p></div>
 <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" />
+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>
@@ -4450,14 +4356,14 @@ into account the configuration in the highlighted dive.</p></div>
 <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
+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
@@ -4645,13 +4551,13 @@ des sections de ce manuel traitant des opérations relatives.</p></div>
 <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>
+</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>.
@@ -4692,85 +4598,85 @@ des sections de ce manuel traitant des opérations relatives.</p></div>
 <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> - Aidez à rendre <em>Subsurface</em> encore
-  meilleur en répondant à notre sondage utilisateur.
-</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>
+  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> - Aidez à rendre <em>Subsurface</em> encore
+  meilleur en répondant à notre sondage utilisateur.
+</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>
@@ -4816,36 +4722,36 @@ 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. Setting up bluetooth enabled devices</h3>
-<div class="admonitionblock">
-<table><tr>
-<td class="icon">
+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. 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
@@ -5174,13 +5080,13 @@ In the dropdown list towards the bottom right of the dialogue, select "<em>CSV
 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>
+<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
@@ -5388,17 +5294,17 @@ The dives are now exported to the file DM4.bak (or DM5.bak)
 </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 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">
@@ -5504,13 +5410,13 @@ Date: use one of the following formats: yyyy-mm-dd, dd.mm.yyyy, mm/dd/yyyy
 <p>
 Duration: the format should be minutes:seconds.
 </p>
-</li>
-<li>
-<p>
-Unit system: only one unit system should be used (i.e., no mixture between
-   imperial and metric units)
-</p>
-</li>
+</li>
+<li>
+<p>
+Unit system: only one unit system should be used (i.e., no mixture between
+   imperial and metric units)
+</p>
+</li>
 <li>
 <p>
 Tags and buddies: values should be separated using a comma.
@@ -5678,14 +5584,14 @@ 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>
-</div>
-</div>
-<div id="footnotes"><hr /></div>
-<div id="footer">
-<div id="footer-text">
-Last updated 2015-02-15 14:28:51 CET
-</div>
-</div>
-</body>
-</html>
+</div>
+</div>
+</div>
+<div id="footnotes"><hr /></div>
+<div id="footer">
+<div id="footer-text">
+Last updated 2015-02-04 07:41:58 PST
+</div>
+</div>
+</body>
+</html>
author	Dirk Hohndel <dirk@hohndel.org>	2015-02-18 21:33:00 -0800
committer	Dirk Hohndel <dirk@hohndel.org>	2015-02-19 19:44:37 -0800
commit	f1f02941c7a8e538db18e10f4937170024d3405e (patch)
tree	708cafb2bb85f373d2729fe3ed52a6d4c8025aee /Documentation/user-manual_fr.html.git
parent	aa7f2eeb8a1a46211b52b9c97e3f040c2f1a5ab8 (diff)
parent	554b652d25d9ce853c4f8f2044f80ab1b198fb1b (diff)
download	subsurface-f1f02941c7a8e538db18e10f4937170024d3405e.tar.gz