Documentation: update french translation of user-manual

Signed-off-by: Guillaume GARDET <guillaume.gardet@free.fr>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>

1 files changed, 862 insertions, 860 deletions

diff --git a/Documentation/user-manual_fr.html.git b/Documentation/user-manual_fr.html.git
index 167c2b9fc..b5941a17d 100644
--- a/Documentation/user-manual_fr.html.git
+++ b/Documentation/user-manual_fr.html.git
@@ -386,9 +386,9 @@ install: function(toclevels) {
     reinstall();

   }

 

-  timerId = setInterval(reinstall, 500);

-  if (document.addEventListener)

-    document.addEventListener("DOMContentLoaded", reinstallAndRemoveTimer, false);

+  timerId = setInterval(reinstall, 500);
+  if (document.addEventListener)
+    document.addEventListener("DOMContentLoaded", reinstallAndRemoveTimer, false);
   else
     window.onload = reinstallAndRemoveTimer;
 }
@@ -432,9 +432,9 @@ Utilisez-vous deux marques différentes d’ordinateurs de plongée, chacun
    Reefnet Sensus avec un ordinateur de plongée ? <em>Subsurface</em> offre une
    interface standard pour télécharger les enregistrements des plongées à
    partir de tous ces équipements de plongée et pour enregistrer et analyser
-   ces enregistrements dans un système unique.

-</p>

-</li>

+   ces enregistrements dans un système unique.
+</p>
+</li>
 <li>

 <p>

 Utilisez-vous plus d&#8217;un système d&#8217;exploitation ? <em>Subsurface</em> est

@@ -445,9 +445,9 @@ Utilisez-vous plus d&#8217;un système d&#8217;exploitation ? <em>Subsurface</em
 </li>

 <li>

 <p>

-Utilisez-vous Linux ou Mac et votre ordinateur de plongée n&#8217;a que des

-   logiciels pour Windows pour télécharger les informations de plongées (par

-   exemple Mares) ? <em>Subsurface</em> fournit un moyen de télécharger et d&#8217;analyser

+Utilisez-vous Linux ou Mac et votre ordinateur de plongée n&#8217;a que des
+   logiciels pour Windows pour télécharger les informations de plongées (par
+   exemple Mares) ? <em>Subsurface</em> fournit un moyen de télécharger et d&#8217;analyser
    vos enregistrements de plongées sur d&#8217;autres systèmes d&#8217;exploitation.
 </p>
 </li>
@@ -473,9 +473,9 @@ disponibles.</p></div>
 <div class="paragraph"><p>Le but de ce document est l&#8217;utilisation du programme Subsurface. Pour
 installer le logiciel, consultez la page <em>Téléchargement</em> sur le
 <a href="http://subsurface-divelog.org/">site web de <em>Subsurface</em></a>. En cas de
-problème, vous pouvez envoyer un e-mail sur

-<a href="mailto:subsurface@subsurface-divelog.org">notre liste de diffusion</a> et

-rapportez les bogues sur <a href="http://trac.hohndel.org">notre bugtracker</a>.  Pour

+problème, vous pouvez envoyer un e-mail sur
+<a href="mailto:subsurface@subsurface-divelog.org">notre liste de diffusion</a> et
+rapportez les bogues sur <a href="http://trac.hohndel.org">notre bugtracker</a>.  Pour
 des instructions de compilation du logiciel et (si besoin) de ses

 dépendances, merci de consulter le fichier INSTALL inclus dans les sources

 logicielles.</p></div>

@@ -485,9 +485,9 @@ professionnels</p></div>
   <div id="toctitle">Table of Contents</div>

   <noscript><p><b>JavaScript must be enabled in your browser to display the table of contents.</b></p></noscript>

 </div>

-<div class="sect1">

-<h2 id="S_UserSurvey">1. Utilisation de ce manuel</h2>

-<div class="sectionbody">

+<div class="sect1">
+<h2 id="S_UserSurvey">1. Utilisation de ce manuel</h2>
+<div class="sectionbody">
 <div class="paragraph"><p>Lorsqu&#8217;il est ouvert depuis <em>Subsurface</em>, ce manuel n&#8217;a pas de contrôles
 externes. Cependant, une fonction de <em>RECHERCHE</em> est importante. Elle est
 activée par la combinaison de touches du clavier Ctrl-F ou commande-F. Un
@@ -754,9 +754,9 @@ therefore recommend that the user checks if the dive computer is charged
 when connected to the USB port of a PC. For example, several Suunto and
 Mares dive computers do not recharge through the USB connection. Users
 should refer to the dive computer&#8217;s manual if they are unsure whether the
-dive computer recharges its batteries while connected to the USB port.</td>

-</tr></table>

-</div>

+dive computer recharges its batteries while connected to the USB port.</td>
+</tr></table>
+</div>
 <div class="paragraph"><p>To import dive information from a dive computer to a computer with

 <em>Subsurface</em>, it is necessary that the two pieces of equipment communicate

 with one another.  This involves setting up the communications port (or

@@ -769,9 +769,9 @@ A</a> provides the technical information to help the user achieving this for
 different operating systems and

 <a href="#_appendix_b_dive_computer_specific_information_for_importing_dive_information">Appendix

 B</a> has dive computer specific information.</p></div>

-<div class="paragraph"><p>After this, the dive computer can be hooked up to the user&#8217;s PC, which can

-be achieved by following these steps:</p></div>

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

+<div class="paragraph"><p>After this, the dive computer can be hooked up to the user&#8217;s PC, which can
+be achieved by following these steps:</p></div>
+<div class="olist arabic"><ol class="arabic">
 <li>
 <p>
 The interface cable should be connected to a free USB port (or the Infra-red
@@ -811,9 +811,9 @@ The dialogue has two drop-down lists, <strong>Vendor</strong> and <strong>Dive C
    name of the dive computer must be selected, e.g. D4 (Suunto), Veo200
    (Oceanic), or Puck (Mares).
 </p>
-</li>

-<li>

-<p>

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

    port name that <em>Subsurface</em> needs in order to communicate with the dive

    computer.  The appropriate port name must be selected. Consult

@@ -833,9 +833,9 @@ If all the dives on the dive computer need to be downloaded, check the
    downloads dives after the date-time of the last dive in the <strong>Dive List</strong>

    panel. If one or more of your dives in <em>Subsurface</em> have been accidentally

    deleted or if there are older dives that still need to be downloaded from

-   the dive computer, this checkbox needs to be activated. Some dive computers

-   (e.g. Mares Puck) do not provide a contents list to <em>Subsurface</em> before the

-   download in order to select only new dives.  Consequently, for these dive

+   the dive computer, this checkbox needs to be activated. Some dive computers
+   (e.g. Mares Puck) do not provide a contents list to <em>Subsurface</em> before the
+   download in order to select only new dives.  Consequently, for these dive
    computers, all dives are downloaded irrespective of the status of this check
    box.
 </p>
@@ -874,8 +874,8 @@ Then select the <em>Download</em> button.  With communication established, one c
    appear in a tabular format on the righthand side of the dialogue (see image
    <strong>B</strong>, above). Each dive comprises a row in the table, with the date, duration
    and depth shown. Next to each dive is a checkbox: check all the dives that
-   need to be transfered to the <strong>Dive List</strong>. In the case of the image above,
-   the last six dives are checked and will be transfered to the <strong>Dive
+   need to be transferred to the <strong>Dive List</strong>. In the case of the image above,
+   the last six dives are checked and will be transferred to the <strong>Dive
    List</strong>. Then click the <em>OK</em> button at the bottom of the dialogue. All the
    imported dives appear in the <strong>Dive List</strong>, sorted by date and
    time. Disconnect and switch off the dive computer to conserve its battery
@@ -884,7 +884,7 @@ Then select the <em>Download</em> button.  With communication established, one c
 </li>
 </ul></div>
 <div class="paragraph"><p>After this has been completed, select the OK button.  The checked dives are
-transfered to the <strong>Dive List</strong>.</p></div>
+transferred to the <strong>Dive List</strong>.</p></div>
 <div class="ulist"><ul>
 <li>
 <p>
@@ -892,9 +892,9 @@ If there is a problem in communicating with the dive computer, an error
    message will be shown, similar to this text: "Unable to open /dev/ttyUSB0
    Mares (Puck Pro)". Refer to the text in the box below.
 </p>
-</li>

-</ul></div>

-<div class="sidebarblock">

+</li>
+</ul></div>
+<div class="sidebarblock">
 <div class="content">

 <div class="paragraph"><p><strong>PROBLEMS WITH DATA DOWNLOAD FROM A DIVE COMPUTER?</strong></p></div>

 <div class="admonitionblock">

@@ -967,9 +967,9 @@ checked, no dives are added to the
 subsurface.bin</code></pre>

 </div></div>

 <div class="paragraph"><p>These files should be send to the <em>Subsurface</em> mail list:

-<em>subsurface@subsurface-divelog.org</em> with a request for the files to be

-analysed. Provide the dive computer make and model as well as contextual

-information about the dives recorded on the dive computer.</p></div>

+<em>subsurface@subsurface-divelog.org</em> with a request for the files to be
+analysed. Provide the dive computer make and model as well as contextual
+information about the dives recorded on the dive computer.</p></div>
 </div></div>
 </div>
 <div class="sect3">
@@ -1037,7 +1037,7 @@ achieved, select the <em>Clear</em> button and then scan again for Bluetooth
 devices using the <em>Scan</em> button. After performing these actions <em>Subsurface</em>
 should see the dive computer.  The label of the discovered dive computer
 contains the name of the device, its address and its pairing status. If the
-device is not paired and has a red background color, a context menu can be
+device is not paired and has a red background colour, a context menu can be
 opened by selecting the item with a right-click.  Select the the <em>Pair</em>
 option and wait for the task to complete.</p></div>
 <div class="sidebarblock">
@@ -1049,7 +1049,7 @@ option and wait for the task to complete.</p></div>
 </td>
 <td class="content">Currently <em>Subsurface</em> does not support Bluetooth pairing with dive
 computers that require a custom PIN code. In order to pair the devices, use
-other OS utility\ies as suggested below.</td>
+other OS utilities as suggested below.</td>
 </tr></table>
 </div>
 <div class="paragraph"><p>One way to achieve this is to use <code>bluetoothctl</code>:</p></div>
@@ -1150,7 +1150,7 @@ on the top left hand of the <em>Subsurface</em> window should be used.</p></div>
 information by hand. The procedure below is virtually identical for
 hand-entered dives and for dives downloaded from a dive computer.</p></div>
 <div class="paragraph"><p>In some cases, one has to provide the date and time of the dive, e.g. when
-entering a dive by hand or when a dive computer does not privide the date
+entering a dive by hand or when a dive computer does not provide the date
 and time of the dive.  (Usually the date and time of the dive, gas mixture
 and water temperature are shown as obtained from the dive computer)  If the
 contents of the <strong>Notes tab</strong> is changed or edited in any way, the message in
@@ -1180,12 +1180,12 @@ automatically supplied by
 be used).</p></div>
 <div class="paragraph"><p><strong>Location</strong>: Here the name of the dive site can be entered, e.g. "Tihany, Lake
 Balaton, Hungary". Dive locations are managed as a separate part of the dive log.
-After entering the information for a particilar dive site, and several dives are
+After entering the information for a particular dive site, and several dives are
 performed at the same location, the information is re-used without requiring
 full dive site information again. Existing dive location information
 can be edited at any time by selecting (on the <strong>Dive List</strong> panel) a dive performed at that site
 and by opening the location information by clicking the globe button on the
-right of the location name (see image on the righ, above). When entering a dive location name, auto location of
+right of the location name (see image on the right, above). When entering a dive location name, auto location of
 dive site names makes it easy to select a dive site that already exists in the dive log
 (i.e. when typing the name of a dive site,
 a dropdown list appears showing all sites with similar names). If the dive
@@ -1389,21 +1389,21 @@ 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

+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
@@ -1423,23 +1423,23 @@ buoy". This is easily done:</p></div>
 Right-click at the appropriate point on the dive profile.  This brings up
    the dive profile context menu. Select <em>Add bookmark</em>. A red flag is placed
    on the dive profile at the point that was initially selected (see <strong>A</strong>
-   below).

-</p>

-</li>

-<li>

-<p>

-Right-click on the red flag. This brings up the context menu (see <strong>B</strong>

-   below). Select <em>Edit name</em>.

-</p>

-</li>

-<li>

-<p>

-A text box is shown. Type the explanatory text for the bookmark (see <strong>C</strong>

-   below). Select <em>OK</em>.  This saves the text associated with the bookmark.

-</p>

-</li>

-<li>

-<p>

+   below).
+</p>
+</li>
+<li>
+<p>
+Right-click on the red flag. This brings up the context menu (see <strong>B</strong>
+   below). Select <em>Edit name</em>.
+</p>
+</li>
+<li>
+<p>
+A text box is shown. Type the explanatory text for the bookmark (see <strong>C</strong>
+   below). Select <em>OK</em>.  This saves the text associated with the bookmark.
+</p>
+</li>
+<li>
+<p>
 If one hovers using the mouse over the red bookmark, the appropriate text is
    shown at the bottom of the information box (see <strong>D</strong> below).
 </p>
@@ -1678,13 +1678,13 @@ line.</p></div>
 <p>
 <em>CSV dive profile</em>: This dive log format includes much more information
    about a single dive. For instance there may be information at 30-second
-   intervals, indicating depth, water temperature at that depth, and cylinder

-   pressure at that moment in time. Each line contains the information for a

-   single instant in time during the dive, 30 seconds after that of the

-   previous instant. Many lines are required to complete the depth profile

-   information for a single dive. This is a common export format used by

-   closed-circuit rebreather (CCR) dive equipment and many software packages

-   that handle dive computer data and/or dive logs.

+   intervals, indicating depth, water temperature at that depth, and cylinder
+   pressure at that moment in time. Each line contains the information for a
+   single instant in time during the dive, 30 seconds after that of the
+   previous instant. Many lines are required to complete the depth profile
+   information for a single dive. This is a common export format used by
+   closed-circuit rebreather (CCR) dive equipment and many software packages
+   that handle dive computer data and/or dive logs.
 </p>
 </li>
 </ol></div>
@@ -1713,21 +1713,21 @@ Which data columns need to be imported into <em>Subsurface</em>? Is it a <em>CSV
 <li>
 <p>
 Is the numeric information (e.g. dive depth) in metric or in imperial unis?
-</p>

-</li>

-</ol></div>

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

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

-the resulting file selection menu, select <em>CSV files</em> (towards the bottom

-right). This shows all .CSV files in the selected directory. Select the file

-that needs to be imported. A configuration panel appears as depicted below:</p></div>

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

-<div class="content">

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

-</div>

-</div>

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

-pre-configured settings for some of the more common dive computers and

+</p>
+</li>
+</ol></div>
+<div class="paragraph"><p>Armed with this information, importing the data into <em>Subsurface</em> is
+straightforward. Select <em>Import &#8594; Import Log Files</em> from the main menu. In
+the resulting file selection menu, select <em>CSV files</em> (towards the bottom
+right). This shows all .CSV files in the selected directory. Select the file
+that needs to be imported. A configuration panel appears as depicted below:</p></div>
+<div class="imageblock" style="text-align:center;">
+<div class="content">
+<img src="images/csv_import1_f20.jpg" alt="FIGURE: CSV download dialogue 1" />
+</div>
+</div>
+<div class="paragraph"><p>Notice that, at the top left, there is a dropdown list containing
+pre-configured settings for some of the more common dive computers and
 software packages encountered by divers. If the <em>CSV</em> file being imported
 originated from any of these pre-configured items, then select it. Otherwise
 use the <em>Manual Import</em> option. The configuration panel also has dropdown
@@ -1766,30 +1766,30 @@ in the <strong>Dive List</strong> panel.</p></div>
 <td class="icon">
 <img src="images/icons/important.png" alt="Important" />
 </td>
-<td class="content"><em>CSV</em> is an abbreviation for a data file format: <em>Comma-Separated

-Values</em>. It is a file format allowing someone to view or edit the

-information using a text editor such as Notepad (Windows), gedit (Linux) or

-TextWrangler (OS/X). The two main advantages of the <em>CSV</em> format is that the

-data are easily editable as text without any proprietary software and

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

-or proprietary attributes that proprietary software insert into files.

-Because of its simplicity the <em>CSV</em> format is used as an interchange format

-between many software packages, e.g. between spreadsheet, statistical,

-graphics, database and diving software. Within <em>Subsurface</em>, <em>CSV</em> files can

-also be used to import information from other sources such as

-spreadsheet-based dive logs and even from some dive computers.</td>

-</tr></table>

-</div>

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

-important attribute of a <em>CSV</em> file is the <em>field separator</em>, the character

-used to separate fields within a single line. The field separator is

-frequently a comma, a colon, a SPACE character or a TAB character. When

-exporting data from spreadsheet software, the field separator needs to be

-specified in order to create the <em>CSV</em> file. <em>CSV</em> files are normally

-organised into a single line that provides the headers (or <em>field names</em>) of

-the data columns, followed by the data, one record per line. Note that each

-field name may comprise more than one word separated by spaces; for instance

-<em>Dive site</em>, below. Here is an example of dive information for four dives

+<td class="content"><em>CSV</em> is an abbreviation for a data file format: <em>Comma-Separated
+Values</em>. It is a file format allowing someone to view or edit the
+information using a text editor such as Notepad (Windows), gedit (Linux) or
+TextWrangler (OS/X). The two main advantages of the <em>CSV</em> format is that the
+data are easily editable as text without any proprietary software and
+ensuring all information is human-readable, not being obscured by any custom
+or proprietary attributes that proprietary software insert into files.
+Because of its simplicity the <em>CSV</em> format is used as an interchange format
+between many software packages, e.g. between spreadsheet, statistical,
+graphics, database and diving software. Within <em>Subsurface</em>, <em>CSV</em> files can
+also be used to import information from other sources such as
+spreadsheet-based dive logs and even from some dive computers.</td>
+</tr></table>
+</div>
+<div class="paragraph"><p><em>CSV</em> files can be created or edited with a normal text editor. The most
+important attribute of a <em>CSV</em> file is the <em>field separator</em>, the character
+used to separate fields within a single line. The field separator is
+frequently a comma, a colon, a SPACE character or a TAB character. When
+exporting data from spreadsheet software, the field separator needs to be
+specified in order to create the <em>CSV</em> file. <em>CSV</em> files are normally
+organised into a single line that provides the headers (or <em>field names</em>) of
+the data columns, followed by the data, one record per line. Note that each
+field name may comprise more than one word separated by spaces; for instance
+<em>Dive site</em>, below. Here is an example of dive information for four dives
 using a comma as a field separator:</p></div>
 <div class="literalblock">
 <div class="content">
@@ -1810,35 +1810,35 @@ Wismar Baltic   2012-12-01      10:13   35:27   15.4    Dieter Albrecht
 Pulau Weh       2012-12-20      09:46   55:56   38.6    Karaeng Bontonompo</code></pre>
 </div></div>
 <div class="paragraph"><p>It is clear why many people prefer the TAB-delimited format to the
-comma-delimited format. The disadvantage is that one cannot see the TAB

-characters. For instance, the space between <em>Dive</em> and <em>date</em> in the top

-line may be a SPACE character or a TAB character (in this case it is a SPACE

-character: the tabs are before and after <em>Dive date</em>). If the field names in

-the first line are long, the alignment with data in the other lines cannot

-be maintained. Here is a highly simplified and shortened TAB-delimited

-example of a <em>CSV</em> dive log from an APD closed-circuit rebreather (CCR) dive

-computer:</p></div>

-<div class="literalblock">

-<div class="content">

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

-0       0.0     0.70    0.81    13.1

-0       1.2     0.70    0.71    13.1

-0       0.0     0.70    0.71    13.1

-0       1.2     0.70    0.71    13.2

-0       1.2     0.70    0.71    13.1

-10      1.6     0.70    0.72    12.7

-20      1.6     0.70    0.71    12.6

-30      1.7     0.70    0.71    12.6

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

-</div></div>

-<div class="paragraph"><p>When a <em>CSV</em> file is selected for import, <em>Subsurface</em> displays the column

-headers as well as some of the data in the first few lines of the <em>CSV</em>

-file, making it much easier to work with <em>CSV</em> files.  <em>CSV</em> files can

-therefore be used in many contexts for importing data into a <em>Subsurface</em>

-dive log.  Knowledge of a few basic things about the content of the <em>CSV</em>

-file allows a smooth import of the dives into <em>Subsurface</em>.</p></div>

-</div></div>

-<div class="admonitionblock">

+comma-delimited format. The disadvantage is that one cannot see the TAB
+characters. For instance, the space between <em>Dive</em> and <em>date</em> in the top
+line may be a SPACE character or a TAB character (in this case it is a SPACE
+character: the tabs are before and after <em>Dive date</em>). If the field names in
+the first line are long, the alignment with data in the other lines cannot
+be maintained. Here is a highly simplified and shortened TAB-delimited
+example of a <em>CSV</em> dive log from an APD closed-circuit rebreather (CCR) dive
+computer:</p></div>
+<div class="literalblock">
+<div class="content">
+<pre><code>Dive Time (s)   Depth (m)       pO₂ - Setpoint (Bar)  pO₂ - C1 Cell 1 (Bar) Ambient temp. (Celsius)
+0       0.0     0.70    0.81    13.1
+0       1.2     0.70    0.71    13.1
+0       0.0     0.70    0.71    13.1
+0       1.2     0.70    0.71    13.2
+0       1.2     0.70    0.71    13.1
+10      1.6     0.70    0.72    12.7
+20      1.6     0.70    0.71    12.6
+30      1.7     0.70    0.71    12.6
+40      1.8     0.70    0.68    12.5</code></pre>
+</div></div>
+<div class="paragraph"><p>When a <em>CSV</em> file is selected for import, <em>Subsurface</em> displays the column
+headers as well as some of the data in the first few lines of the <em>CSV</em>
+file, making it much easier to work with <em>CSV</em> files.  <em>CSV</em> files can
+therefore be used in many contexts for importing data into a <em>Subsurface</em>
+dive log.  Knowledge of a few basic things about the content of the <em>CSV</em>
+file allows a smooth import of the dives into <em>Subsurface</em>.</p></div>
+</div></div>
+<div class="admonitionblock">
 <table><tr>
 <td class="icon">
 <img src="images/icons/important.png" alt="Important" />
@@ -1874,113 +1874,113 @@ the localities from the file server.</p></div>
 Register on the <a href="http://api.hohndel.org/login/"><em>Subsurface companion web
   page</em></a>.  A confirmation email with instructions and a personal <strong>DIVERID</strong>
   will be sent, a long number that gives access to the file server and
-  Companion App capabilities.

-</p>

-</li>

-<li>

-<p>

-Download the app from

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

-  Store</a> or from

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

-</p>

-</li>

-</ul></div>

-</div>

-<div class="sect3">

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

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

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

-<li>

-<p>

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

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

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

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

-  to activate the account.

-</p>

-</li>

-<li>

-<p>

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

-  email to recover the number.

-</p>

-</li>

-<li>

-<p>

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

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

-  <em>Disconnect</em> menu option (see below).

-</p>

-</li>

-</ul></div>

-<div class="admonitionblock">

-<table><tr>

-<td class="icon">

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

-</td>

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

-the Default Preferences panel, obtained by selecting <em>File &#8594; Preferences &#8594;

-Defaults</em> from the main menu in <em>Subsurface</em> itself.  This facilitates

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

-</tr></table>

-</div>

-<div class="sect4">

-<h5 id="_creating_new_dive_locations">Creating new dive locations</h5>

-<div class="paragraph"><p>Now one is ready to get a dive position and send it to the server. The

-Android display will look like the left hand image (<strong>A</strong>) below, but without

-any dives.</p></div>

-<div class="paragraph"><p>Touch the "+" icon on the top right to add a new dive site, a menu will be

-showed with 3 options:</p></div>

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

-<li>

-<p>

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

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

-</p>

-</li>

-<li>

-<p>

-Use Map: This option allows the user to fix a position by searching a world

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

-  desired position with a <em>long press</em> on the touch sensitive screen (if the

-  marked location is erroneous, simply indicate a new location)  and select

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

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

-  order to import this dive location in <em>Subsurface</em> it&#8217;s advisable to set the

-  time to agree with the time of that dive on the dive computer.

-</p>

-</li>

-</ul></div>

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

-<div class="content">

-<img src="images/Companion_5.jpg" alt="FIGURE: Companion App, add location using map" />

-</div>

-</div>

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

-<li>

-<p>

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

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

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

-  then select the tab in the upper right, after which the locations will be

-  sent to the web service and added to the list on the Android device.

-</p>

-</li>

-</ul></div>

-</div>

-<div class="sect4">

-<h5 id="_dive_lists_of_dive_locations">Dive lists of dive locations</h5>

-<div class="paragraph"><p>The main screen shows a list of dive locations, each with a name, date and

-time (see <strong>A</strong> below). Some locations may have an arrow-up icon over the

-selection box to the left indicating that they require upload to the

-server. One can select individual dive locations from the list. A selected

-location has a check mark in the selection box on the left. Group operations

-(such as <em>Delete</em> or <em>Send</em>)  are performed on several locations that are

-selected.</p></div>

-<div class="paragraph"><p>Dive locations in this list can be viewed in two ways: a list of locations

-or a map indicating the dive locations. The display mode (List or Map) is

-changed by selecting <em>Dives</em> at the top left of the screen (see <strong>A</strong> below)

+  Companion App capabilities.
+</p>
+</li>
+<li>
+<p>
+Download the app from
+  <a href="https://play.google.com/store/apps/details?id=org.subsurface">Google Play
+  Store</a> or from
+  <a href="http://f-droid.org/repository/browse/?fdfilter=subsurface&amp;fdid=org.subsurface">F-Droid</a>.
+</p>
+</li>
+</ul></div>
+</div>
+<div class="sect3">
+<h4 id="_using_the_subsurface_companion_app_on_an_android_smartphone">5.4.2. Using the Subsurface companion app on an Android smartphone</h4>
+<div class="paragraph"><p>On first use the app has three options:</p></div>
+<div class="ulist"><ul>
+<li>
+<p>
+<em>Create a new account.</em> Equivalent to registering in <em>Subsurface</em> companion
+  page using an Internet browser. One can request a <strong>DIVERID</strong> using this
+  option, but this is supplied via email and followed up by interaction with
+  the <a href="http://api.hohndel.org/login/"><em>Subsurface companion web page</em></a> in order
+  to activate the account.
+</p>
+</li>
+<li>
+<p>
+<em>Retrieve an account.</em> If users forgot their <strong>DIVERID</strong> they will receive an
+  email to recover the number.
+</p>
+</li>
+<li>
+<p>
+<em>Use an existing account.</em> Users are prompted for their <strong>DIVERID</strong>. The app
+  saves this <strong>DIVERID</strong> and does not ask for it again unless one uses the
+  <em>Disconnect</em> menu option (see below).
+</p>
+</li>
+</ul></div>
+<div class="admonitionblock">
+<table><tr>
+<td class="icon">
+<img src="images/icons/important.png" alt="Important" />
+</td>
+<td class="content">In the <em>Subsurface</em> main program, the <strong>DIVERID</strong> should also be entered on
+the Default Preferences panel, obtained by selecting <em>File &#8594; Preferences &#8594;
+Defaults</em> from the main menu in <em>Subsurface</em> itself.  This facilitates
+synchronisation between <em>Subsurface</em> and the Companion App.</td>
+</tr></table>
+</div>
+<div class="sect4">
+<h5 id="_creating_new_dive_locations">Creating new dive locations</h5>
+<div class="paragraph"><p>Now one is ready to get a dive position and send it to the server. The
+Android display will look like the left hand image (<strong>A</strong>) below, but without
+any dives.</p></div>
+<div class="paragraph"><p>Touch the "+" icon on the top right to add a new dive site, a menu will be
+showed with 3 options:</p></div>
+<div class="ulist"><ul>
+<li>
+<p>
+Current: A prompt for a place name (or a request to activate the GPS if it
+  is turned off) will be displayed, after which the current location is saved.
+</p>
+</li>
+<li>
+<p>
+Use Map: This option allows the user to fix a position by searching a world
+  map. A world map is shown (see <strong>B</strong> below) on which one should indicate the
+  desired position with a <em>long press</em> on the touch sensitive screen (if the
+  marked location is erroneous, simply indicate a new location)  and select
+  the check symbol in the upper right. A dialog is shown allowing to enter the
+  name of the dive location and the date-time of the dive (see <strong>C</strong> below). In
+  order to import this dive location in <em>Subsurface</em> it&#8217;s advisable to set the
+  time to agree with the time of that dive on the dive computer.
+</p>
+</li>
+</ul></div>
+<div class="imageblock" style="text-align:center;">
+<div class="content">
+<img src="images/Companion_5.jpg" alt="FIGURE: Companion App, add location using map" />
+</div>
+</div>
+<div class="ulist"><ul>
+<li>
+<p>
+Import local GPX file: The android device searches for .gpx files and
+  located archives will be shown. The selected .gpx file is opened and the
+  stored locations shown. Now one needs to select the appropriate locations,
+  then select the tab in the upper right, after which the locations will be
+  sent to the web service and added to the list on the Android device.
+</p>
+</li>
+</ul></div>
+</div>
+<div class="sect4">
+<h5 id="_dive_lists_of_dive_locations">Dive lists of dive locations</h5>
+<div class="paragraph"><p>The main screen shows a list of dive locations, each with a name, date and
+time (see <strong>A</strong> below). Some locations may have an arrow-up icon over the
+selection box to the left indicating that they require upload to the
+server. One can select individual dive locations from the list. A selected
+location has a check mark in the selection box on the left. Group operations
+(such as <em>Delete</em> or <em>Send</em>)  are performed on several locations that are
+selected.</p></div>
+<div class="paragraph"><p>Dive locations in this list can be viewed in two ways: a list of locations
+or a map indicating the dive locations. The display mode (List or Map) is
+changed by selecting <em>Dives</em> at the top left of the screen (see <strong>A</strong> below)
 and then selecting the display mode. The display mode can be changed either
 from the list of locations or from the map (see <strong>B</strong> below). If one selects a
 location (on the list or on the map), an editing panel opens (see <strong>C</strong> below)
@@ -2000,262 +2000,262 @@ Edit (pencil): Change the text name or other characteristics of the dive
   location.
 </p>
 </li>
-<li>

-<p>

-Maps: Display a map showing the dive location.

-</p>

-</li>

-</ul></div>

-<div class="paragraph"><p>After editing and saving a dive location (see <strong>C</strong> above), one needs to

-upload it to the web service, as explained below.</p></div>

-</div>

-<div class="sect4">

-<h5 id="_uploading_dive_locations">Uploading dive locations</h5>

-<div class="paragraph"><p>There are several ways to send locations to the server.  The easiest is by

-simply selecting the locations (See <strong>A</strong> below) and then touching the right

-arrow at the top right of the screen.</p></div>

-<div class="admonitionblock">

-<table><tr>

-<td class="icon">

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

-</td>

-<td class="content">Users must be careful, as the trash icon on the right means exactly what it

-should; it deletes the selected dive location(s).</td>

-</tr></table>

-</div>

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

-<div class="content">

-<img src="images/Companion_1.jpg" alt="FIGURE: Screen shots (A-B) of companion app" />

-</div>

-</div>

-<div class="paragraph"><p>After a dive trip using the Companion App, all dive locations are ready to

-be downloaded to a <em>Subsurface</em> dive log (see below).</p></div>

-</div>

-<div class="sect4">

-<h5 id="_settings_on_the_companion_app">Settings on the Companion app</h5>

-<div class="paragraph"><p>Selecting the <em>Settings</em> menu option results in the right hand image above

-(<strong>B</strong>).</p></div>

-</div>

-<div class="sect4">

-<h5 id="_server_and_account">Server and account</h5>

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

-<li>

-<p>

-<em>Web-service URL.</em> This is predefined (<a href="http://api.hohndel.org/">http://api.hohndel.org/</a>)

-</p>

-</li>

-<li>

-<p>

-<em>User ID.</em> The DIVERID obtained by registering as described above. The

-  easiest way to obtain it is simply to copy and paste from the confirmation

-  email but, of course, users can also type this information.

-</p>

-</li>

-</ul></div>

-</div>

-<div class="sect4">

-<h5 id="_synchronisation">Synchronisation</h5>

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

-<li>

-<p>

-<em>Synchronize on startup.</em> If selected, dive locations in the Android device

-  and those on the web service synchronise each time the app is started.

-</p>

-</li>

-<li>

-<p>

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

-  is automatically sent to the server.

-</p>

-</li>

-</ul></div>

-</div>

-<div class="sect4">

-<h5 id="_background_service">Background service</h5>

-<div class="paragraph"><p>Instead of entering a unique dive location, users can leave the service

-running in the background of their Android device, allowing the continuous

-collection of GPS locations.</p></div>

-<div class="paragraph"><p>The settings below define the behaviour of the service:</p></div>

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

-<li>

-<p>

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

-  minutes until stopped by the user.

-</p>

-</li>

-<li>

-<p>

-<em>Min distance.</em> In meters. Minimum distance between two locations.

-</p>

-</li>

-<li>

-<p>

-<em>Name template.</em> The name the app will use when saving the locations.

-</p>

-</li>

-</ul></div>

-<div class="admonitionblock">

-<table><tr>

-<td class="icon">

-<img src="images/icons/info.jpg" alt="Tip" />

-</td>

-<td class="content"><em>How does the background service work?</em> Assuming the user sets 5 minutes and

-50 meters in the settings above, the app will start by recording a location

-at the current location, followed by another one at every 5 minutes <strong>or</strong>

-every time one moves 50m from previous location.  If subsequent locations

-are within a radius of 50 meters from the previous one, a new location is

-not saved. If the user is not moving, only one location is saved, but if the

-user is moving, a trace of the route is obtained by saving a location every

-50 meters.</td>

-</tr></table>

-</div>

-</div>

-<div class="sect4">

-<h5 id="_other">Other</h5>

-<div class="paragraph"><p><em>Mailing List.</em> The mail box for <em>Subsurface</em>. Users can send an email to

-the Subsurface mailing list.</p></div>

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

-<li>

-<p>

-<em>Subsurface website.</em> A link to the URL of Subsurface web

-</p>

-</li>

-<li>

-<p>

-<em>Version.</em> Displays the current version of the Companion App.

-</p>

-</li>

-</ul></div>

-</div>

-<div class="sect4">

-<h5 id="_search">Search</h5>

-<div class="paragraph"><p>Search the saved dive locations by name or by date and time.</p></div>

-</div>

-<div class="sect4">

-<h5 id="_start_service">Start service</h5>

-<div class="paragraph"><p>Initiates the <em>background service</em> following the previously defined

-settings.</p></div>

-</div>

-<div class="sect4">

-<h5 id="_disconnect">Disconnect</h5>

-<div class="paragraph"><p>This is a badly named option that disconnects the app from the server by

-resetting the user ID in the app, showing the first screen where an account

-can be created, retrieve the ID for an existing account or use the users own

-ID. The disconnect option is useful if a user&#8217;s Android device was used to

-download the dive locations of another registered diver.</p></div>

-</div>

-<div class="sect4">

-<h5 id="_send_all_locations">Send all locations</h5>

-<div class="paragraph"><p>This option sends all locations stored in the Android device to the server.</p></div>

-</div>

-</div>

-<div class="sect3">

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

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

-(obtained during registration) into the space reserved for it, then select

-"Dive in" (see left part of the image below) and start collecting dive

-location information.</p></div>

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

-<div class="content">

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

-</div>

-</div>

-<div class="paragraph"><p>Dives can be added automatically or manually. In manual mode, a dive

-location or waypoint is added to the GPS input stream. In automatic mode, a

-continuous path of GPS locations is created from which, much later, after

-import, subsurface can select the appropriate GPS locations based on the

-times of dives. The default mode for the <em>iphone</em> is automatic. When one

-adds a dive, the location service is started automatically and a red bar

-appears at the bottom of the screen. After the dive one can click on the red

-bar to end the location service. While the location service is running one

-can only add dives using the manual mechanism.</p></div>

-<div class="paragraph"><p>One can edit the site name afterwards by selecting the dive from the dive

-list and clicking on the site name. There are no other editable fields. The

-dive list is automatically uploaded from the iphone to the webservice and

-there is not an option to trigger upload manually.</p></div>

-</div>

-<div class="sect3">

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

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

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

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

-Menu <em>Import &#8594; Import GPS data from Subsurface Service</em>, resulting in the

-image on the left (<strong>A</strong>), below. On first use the DIVERID text box is

-blank. Provide a DIVERID, then select the <em>Download</em> button to initiate the

-download process, after which the screen on the right (<strong>B</strong>) below appears:</p></div>

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

-<div class="content">

-<img src="images/DownloadGPS.jpg" alt="FIGURE: Downloading Companion app GPS data" />

-</div>

-</div>

-<div class="paragraph"><p>Note that the <em>Apply</em> button is now active. By clicking on it, users can

-update the locations of the newly entered or uploaded dives in <em>Subsurface</em>

-which applies the coordinates and names entered on the app for all the new

-dives that match the date-times of the uploaded GPS localities. If one has

-entered the name of the dive location in <em>Subsurface</em> before downloading the

-GPS coordinates, this name will take precedence over downloaded one.</p></div>

-<div class="paragraph"><p>Since <em>Subsurface</em> matches GPS locations from the Android device and dive

-information from the dive computer based on date-time data, automatic

-assignment of GPS data to dives is dependent on agreement of the date-time

-information between these two devices. Although <em>Subsurface</em> has a wide

-range tolerance, it may be unable to identify the appropriate dive if there

-is a large difference between the time in the dive computer and that of the

-Android device, resulting in no updates.</p></div>

-<div class="paragraph"><p>Similar date-times may not always be possible and there may be many reasons

-for this (e.g. time zones), or <em>Subsurface</em> may be unable to decide which is

-the correct position for a dive (e.g. on repetitive dives while running

-<em>background service</em> there may be several locations that would be included

-in the time range that fit not only the first dive, but one or more

-subsequent dives as well).  A workaround for this situation to manually edit

-the date-time of a dive in the <em>Subsurface</em> Dive List <strong>before</strong> downloading

-the GPS data and then to change the date-time back again <strong>after</strong> downloading

-GPS data.</p></div>

-<div class="admonitionblock">

-<table><tr>

-<td class="icon">

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

-</td>

-<td class="content">TIPS:</td>

-</tr></table>

-</div>

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

-<li>

-<p>

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

-  with many unnecessary locations not corresponding to the exact dive point

-  but reflecting the boat&#8217;s route.  Currently these locations are difficult to

-  delete from the server. In some situations it is therefore prudent to clean

-  up the list on the Android device before sending the dive points to the web

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

-  necessary, for instance, if one wants to keep the location list clear to see

-  dives in the web service map display (see above).

-</p>

-</li>

-<li>

-<p>

-It may also make sense to give informative names to the locations sent to

-  the web server, or at least to use an informative name in the <em>Name

-  Template</em> setting while running the <em>background service</em>, especially on a

-  dive trip with many dives and dive locations.

-</p>

-</li>

-</ul></div>

-</div>

-</div>

-<div class="sect2">

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

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

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

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

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

-<div class="sect3">

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

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

-right-click on this dive or group of dives and choose the option <em>Load

-Images</em>:</p></div>

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

-<div class="content">

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

+<li>
+<p>
+Maps: Display a map showing the dive location.
+</p>
+</li>
+</ul></div>
+<div class="paragraph"><p>After editing and saving a dive location (see <strong>C</strong> above), one needs to
+upload it to the web service, as explained below.</p></div>
+</div>
+<div class="sect4">
+<h5 id="_uploading_dive_locations">Uploading dive locations</h5>
+<div class="paragraph"><p>There are several ways to send locations to the server.  The easiest is by
+simply selecting the locations (See <strong>A</strong> below) and then touching the right
+arrow at the top right of the screen.</p></div>
+<div class="admonitionblock">
+<table><tr>
+<td class="icon">
+<img src="images/icons/important.png" alt="Important" />
+</td>
+<td class="content">Users must be careful, as the trash icon on the right means exactly what it
+should; it deletes the selected dive location(s).</td>
+</tr></table>
+</div>
+<div class="imageblock" style="text-align:center;">
+<div class="content">
+<img src="images/Companion_1.jpg" alt="FIGURE: Screen shots (A-B) of companion app" />
+</div>
+</div>
+<div class="paragraph"><p>After a dive trip using the Companion App, all dive locations are ready to
+be downloaded to a <em>Subsurface</em> dive log (see below).</p></div>
+</div>
+<div class="sect4">
+<h5 id="_settings_on_the_companion_app">Settings on the Companion App</h5>
+<div class="paragraph"><p>Selecting the <em>Settings</em> menu option results in the right hand image above
+(<strong>B</strong>).</p></div>
+</div>
+<div class="sect4">
+<h5 id="_server_and_account">Server and account</h5>
+<div class="ulist"><ul>
+<li>
+<p>
+<em>Web-service URL.</em> This is predefined (<a href="http://api.hohndel.org/">http://api.hohndel.org/</a>)
+</p>
+</li>
+<li>
+<p>
+<em>User ID.</em> The DIVERID obtained by registering as described above. The
+  easiest way to obtain it is simply to copy and paste from the confirmation
+  email but, of course, users can also type this information.
+</p>
+</li>
+</ul></div>
+</div>
+<div class="sect4">
+<h5 id="_synchronisation">Synchronisation</h5>
+<div class="ulist"><ul>
+<li>
+<p>
+<em>Synchronize on startup</em>. If selected, dive locations in the Android device
+  and those on the web service synchronise each time the app is started.
+</p>
+</li>
+<li>
+<p>
+<em>Upload new dives.</em> If selected, each time the user adds a dive location it
+  is automatically sent to the server.
+</p>
+</li>
+</ul></div>
+</div>
+<div class="sect4">
+<h5 id="_background_service">Background service</h5>
+<div class="paragraph"><p>Instead of entering a unique dive location, users can leave the service
+running in the background of their Android device, allowing the continuous
+collection of GPS locations.</p></div>
+<div class="paragraph"><p>The settings below define the behaviour of the service:</p></div>
+<div class="ulist"><ul>
+<li>
+<p>
+<em>Min duration.</em> In minutes. The app will try to get a location every X
+  minutes until stopped by the user.
+</p>
+</li>
+<li>
+<p>
+<em>Min distance.</em> In meters. Minimum distance between two locations.
+</p>
+</li>
+<li>
+<p>
+<em>Name template.</em> The name the app will use when saving the locations.
+</p>
+</li>
+</ul></div>
+<div class="admonitionblock">
+<table><tr>
+<td class="icon">
+<img src="images/icons/info.jpg" alt="Tip" />
+</td>
+<td class="content"><em>How does the background service work?</em> Assuming the user sets 5 minutes and
+50 meters in the settings above, the app will start by recording a location
+at the current location, followed by another one at every 5 minutes <strong>or</strong>
+every time one moves 50m from previous location.  If subsequent locations
+are within a radius of 50 meters from the previous one, a new location is
+not saved. If the user is not moving, only one location is saved, but if the
+user is moving, a trace of the route is obtained by saving a location every
+50 meters.</td>
+</tr></table>
+</div>
+</div>
+<div class="sect4">
+<h5 id="_other">Other</h5>
+<div class="paragraph"><p><em>Mailing List.</em> The mail box for <em>Subsurface</em>. Users can send an email to
+the Subsurface mailing list.</p></div>
+<div class="ulist"><ul>
+<li>
+<p>
+<em>Subsurface website.</em> A link to the URL of Subsurface web
+</p>
+</li>
+<li>
+<p>
+<em>Version.</em> Displays the current version of the Companion App.
+</p>
+</li>
+</ul></div>
+</div>
+<div class="sect4">
+<h5 id="_search">Search</h5>
+<div class="paragraph"><p>Search the saved dive locations by name or by date and time.</p></div>
+</div>
+<div class="sect4">
+<h5 id="_start_service">Start service</h5>
+<div class="paragraph"><p>Initiates the <em>background service</em> following the previously defined
+settings.</p></div>
+</div>
+<div class="sect4">
+<h5 id="_disconnect">Disconnect</h5>
+<div class="paragraph"><p>This is a badly named option that disconnects the app from the server by
+resetting the user ID in the app, showing the first screen where an account
+can be created, retrieve the ID for an existing account or use the users own
+ID. The disconnect option is useful if a user&#8217;s Android device was used to
+download the dive locations of another registered diver.</p></div>
+</div>
+<div class="sect4">
+<h5 id="_send_all_locations">Send all locations</h5>
+<div class="paragraph"><p>This option sends all locations stored in the Android device to the server.</p></div>
+</div>
+</div>
+<div class="sect3">
+<h4 id="S_iphone">5.4.3. Using the Subsurface companion app on an <em>iPhone</em> to record dive locations</h4>
+<div class="paragraph"><p>The iPhone interface is quite simple. One needs to type the user ID
+(obtained during registration) into the space reserved for it, then select
+"Dive in" (see left part of the image below) and start collecting dive
+location information.</p></div>
+<div class="imageblock" style="text-align:center;">
+<div class="content">
+<img src="images/iphone.jpg" alt="FIGURE: Using iPhone companion application" width="640" />
+</div>
+</div>
+<div class="paragraph"><p>Dives can be added automatically or manually. In manual mode, a dive
+location or waypoint is added to the GPS input stream. In automatic mode, a
+continuous path of GPS locations is created from which, much later, after
+import, subsurface can select the appropriate GPS locations based on the
+times of dives. The default mode for the <em>iphone</em> is automatic. When one
+adds a dive, the location service is started automatically and a red bar
+appears at the bottom of the screen. After the dive one can click on the red
+bar to end the location service. While the location service is running one
+can only add dives using the manual mechanism.</p></div>
+<div class="paragraph"><p>One can edit the site name afterwards by selecting the dive from the dive
+list and clicking on the site name. There are no other editable fields. The
+dive list is automatically uploaded from the iphone to the webservice and
+there is not an option to trigger upload manually.</p></div>
+</div>
+<div class="sect3">
+<h4 id="_downloading_dive_locations_to_the_em_subsurface_em_divelog">5.4.4. Downloading dive locations to the <em>Subsurface</em> divelog</h4>
+<div class="paragraph"><p>Download dive(s) from a dive computer or enter them manually into
+<em>Subsurface</em> before obtaining the GPS coordinates from the server. The
+download dialog can be reached via <em>Ctrl+G</em> or from the <em>Subsurface</em> Main
+Menu <em>Import &#8594; Import GPS data from Subsurface Service</em>, resulting in the
+image on the left (<strong>A</strong>), below. On first use the DIVERID text box is
+blank. Provide a DIVERID, then select the <em>Download</em> button to initiate the
+download process, after which the screen on the right (<strong>B</strong>) below appears:</p></div>
+<div class="imageblock" style="text-align:center;">
+<div class="content">
+<img src="images/DownloadGPS.jpg" alt="FIGURE: Downloading Companion app GPS data" />
+</div>
+</div>
+<div class="paragraph"><p>Note that the <em>Apply</em> button is now active. By clicking on it, users can
+update the locations of the newly entered or uploaded dives in <em>Subsurface</em>
+which applies the coordinates and names entered on the app for all the new
+dives that match the date-times of the uploaded GPS localities. If one has
+entered the name of the dive location in <em>Subsurface</em> before downloading the
+GPS coordinates, this name will take precedence over downloaded one.</p></div>
+<div class="paragraph"><p>Since <em>Subsurface</em> matches GPS locations from the Android device and dive
+information from the dive computer based on date-time data, automatic
+assignment of GPS data to dives is dependent on agreement of the date-time
+information between these two devices. Although <em>Subsurface</em> has a wide
+range tolerance, it may be unable to identify the appropriate dive if there
+is a large difference between the time in the dive computer and that of the
+Android device, resulting in no updates.</p></div>
+<div class="paragraph"><p>Similar date-times may not always be possible and there may be many reasons
+for this (e.g. time zones), or <em>Subsurface</em> may be unable to decide which is
+the correct position for a dive (e.g. on repetitive dives while running
+<em>background service</em> there may be several locations that would be included
+in the time range that fit not only the first dive, but one or more
+subsequent dives as well).  A workaround for this situation to manually edit
+the date-time of a dive in the <em>Subsurface</em> Dive List <strong>before</strong> downloading
+the GPS data and then to change the date-time back again <strong>after</strong> downloading
+GPS data.</p></div>
+<div class="admonitionblock">
+<table><tr>
+<td class="icon">
+<img src="images/icons/info.jpg" alt="Note" />
+</td>
+<td class="content">TIPS:</td>
+</tr></table>
+</div>
+<div class="ulist"><ul>
+<li>
+<p>
+<em>Background service</em>, being a very powerful tool, may fill the location list
+  with many unnecessary locations not corresponding to the exact dive point
+  but reflecting the boat&#8217;s route.  Currently these locations are difficult to
+  delete from the server. In some situations it is therefore prudent to clean
+  up the list on the Android device before sending the dive points to the web
+  server by simply deleting the inappropriate locations. This might be
+  necessary, for instance, if one wants to keep the location list clear to see
+  dives in the web service map display (see above).
+</p>
+</li>
+<li>
+<p>
+It may also make sense to give informative names to the locations sent to
+  the web server, or at least to use an informative name in the <em>Name
+  Template</em> setting while running the <em>background service</em>, especially on a
+  dive trip with many dives and dive locations.
+</p>
+</li>
+</ul></div>
+</div>
+</div>
+<div class="sect2">
+<h3 id="S_LoadImage">5.5. Adding photographs to dives</h3>
+<div class="paragraph"><p>Many (if not most) divers take a camera with them and take photographs
+during a dive. One would like to associate each photograph with a specific
+dive. <em>Subsurface</em> allows one to load photos into a dive. Photos are
+superimposed on the dive profile, from where they can be viewed.</p></div>
+<div class="sect3">
+<h4 id="_loading_photos_and_getting_synchronisation_between_dive_computer_and_camera">5.5.1. Loading photos and getting synchronisation between dive computer and camera</h4>
+<div class="paragraph"><p>Left-lick on a dive or on a group of dives on the dive list. Then
+right-click on this dive or group of dives and choose the option <em>Load
+Images</em>:</p></div>
+<div class="imageblock" style="text-align:center;">
+<div class="content">
+<img src="images/LoadImage1_f20.jpg" alt="FIGURE: Load images option" />
 </div>
 </div>
 <div class="paragraph"><p>The system file browser appears. Select the folder and photographs that need
@@ -2290,13 +2290,13 @@ position photographs on the dive profile.</p></div>
   If the camera time is 7 minutes later than that of the dive computer, set the time setting
   tool to a value of 00:07.  Select either the <em>earlier</em> or <em>later</em> radio button.
   In the above example, the <em>earlier</em> option is appropriate, since the photos need to be shifted
-  7 minutes earlier (camera is 7 minutes ahead of dive computer). Ignore any "AM" or "PM" suffix

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

-</p>

-</li>

-</ul></div>

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

-<div class="content">

+  7 minutes earlier (camera is 7 minutes ahead of dive computer). Ignore any "AM" or "PM" suffix
+  in that tool. Click the <em>OK</em> button and synchronisation is achieved.
+</p>
+</li>
+</ul></div>
+<div class="imageblock" style="text-align:center;">
+<div class="content">
 <img src="images/LoadImage3b_f20.jpg" alt="FIGURE: Synchronisation dialog" />
 </div>
 </div>
@@ -2357,22 +2357,22 @@ as tiny icons (stubs) on the dive profile at the appropriate positions
 photo is shown of the appropriate photo. See the image below:</p></div>
 <div class="imageblock" style="text-align:center;">
 <div class="content">
-<img src="images/LoadImage5_f20.jpg" alt="FIGURE:Thumbnail photo on dive profile" />

-</div>

-</div>

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

-<em>Subsurface</em> window. This allows good viewing of the photographs that have

-been added (see the image below). Note that the thumbnail has a small

-dustbin icon in the bottom right hand corner (see image above). If one

-selects the dustbin, the image is removed from the dive. Therefore some care

-is required when clicking on a thumbnail. Images can also be deleted using

-the <em>Photos</em> tab (see text below).</p></div>

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

-<div class="content">

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

-</div>

-</div>

-</div>

+<img src="images/LoadImage5_f20.jpg" alt="FIGURE:Thumbnail photo on dive profile" />
+</div>
+</div>
+<div class="paragraph"><p>Clicking on the thumbnail brings up a full size photo overlaid on the
+<em>Subsurface</em> window. This allows good viewing of the photographs that have
+been added (see the image below). Note that the thumbnail has a small
+dustbin icon in the bottom right hand corner (see image above). If one
+selects the dustbin, the image is removed from the dive. Therefore some care
+is required when clicking on a thumbnail. Images can also be deleted using
+the <em>Photos</em> tab (see text below).</p></div>
+<div class="imageblock" style="text-align:center;">
+<div class="content">
+<img src="images/LoadImage6_f20.jpg" alt="FIGURE: Full-screen photo on dive profile" />
+</div>
+</div>
+</div>
 <div class="sect3">
 <h4 id="_the_em_photos_em_tab">5.5.3. The <em>Photos</em> tab</h4>
 <div class="paragraph"><p>Photographs associated with a dive are shown as thumbnails in the <em>Photos</em>
@@ -2443,7 +2443,7 @@ if there is a match between a calculated fingerprint and the one originally
 <div class="paragraph"><p>This is achieved by selecting from the Main Menu: <em>File &#8594;      Find moved images</em>. This brings up a window within
  which the NEW directory of the photos needs to be specified. Select the appropriate directory and click
  the <em>Scan</em> button towards the bottom right of the panel. The process may require several minutes to
- complete, after which <em>subsurface</em> will show the appropriate photographs when a particular dive is opened.</p></div>
+ complete, after which <em>Subsurface</em> will show the appropriate photographs when a particular dive is opened.</p></div>
 <div class="sidebarblock" id="Image_fingerprint_upgrade">
 <div class="content">
 <div class="paragraph"><p><strong>Upgrading existing photo collections without fingerprints</strong></p></div>
@@ -2453,13 +2453,13 @@ if there is a match between a calculated fingerprint and the one originally
 <img src="images/icons/important.png" alt="Important" />
 </td>
 <td class="content">Software for the automated finger print calculation of existing photo
-collections is under developement. Currently single dives must be upgraded
+collections is under development. Currently single dives must be upgraded
 one at a time. Select the toolbar button on the <strong>Dive profile</strong> panel that
 enables the display of images. The thumbnails of images are shown on the
 dive profile. Then open the dive and change anything in the <strong>Notes</strong> panel
 that brings up the blue edit bar at the top of the notes panel to save the
 edits. For instance, add a space character at the end of the <em>Notes</em> text
-box and immediately delete that space character. Select the optio <em>Apply
+box and immediately delete that space character. Select the option <em>Apply
 changes</em> in the blue edit bar to save the dive information.  Fingerprints
 are calculated while saving this specific dive.</td>
 </tr></table>
@@ -2988,159 +2988,159 @@ that free divers clearly won’t care about.</p></div>
 </td>
 <td class="content">Measurements of <strong>depth or time differences</strong> can be achieved by using the
 <strong>ruler button</strong> on the left of the dive profile panel.  The measurement is
-done by dragging the red dots to the two points on the dive profile that the

-user wishes to measure. Information is then given in the horizontal white

-area underneath the two red dots.</td>

-</tr></table>

-</div>

-<div class="admonitionblock">

-<table><tr>

-<td class="icon">

-<img src="images/icons/ShowPhotos.png" alt="Note" />

-</td>

-<td class="content">Photographs that have been added to a dive can be shown on the profile by

-selecting the <strong>Show-photo</strong> button. The position of a photo on the profile

-indicates the exact time when this photo was taken. If this button is not

-active, the photos are hidden.</td>

-</tr></table>

-</div>

-<div class="paragraph"><p>The profile can also include the dive computer reported <strong>ceiling</strong> (more

-precisely, the deepest deco stop that the dive computer calculated for each

-particular moment in time) as a red overlay on the dive profile. Ascent

-ceilings arise when a direct ascent to the surface increases the risk of a

-diver suffering from decompression sickness (DCS) and it is necessary to

-either ascend slower or to perform decompression stop(s) before ascending to

-the surface. Not all dive computers record this information and make it

-available for download; for example all of the Suunto dive computers fail to

-make this very useful data available to divelog software. <em>Subsurface</em> also

-calculates ceilings independently, shown as a green overlay on the dive

-profile.  Because of the differences in algorithms used and amount of data

-available (and other factors taken into consideration at the time of the

-calculation) it is unlikely that ceilings from dive computers and from

-<em>Subsurface</em> are the same, even if the same algorithm and <em>gradient factors</em>

-(see below) are used.  It is also quite common that <em>Subsurface</em> calculates

-a ceiling for non-decompression dives when the dive computer stayed in

-non-deco mode during the whole dive (represented by the <span class="green">dark green</span>

-section in the profile at the beginning of this section). This is caused by

-the fact that <em>Subsurface’s</em> calculations describe the deco obligation at

-each moment during a dive, while dive computers usually take the upcoming

-ascent into account. During the ascent some excess nitrogen (and possibly

-helium) are already breathed off so even though the diver technically

-encountered a ceiling at depth, the dive still does not require an explicit

-deco stop. This feature allows dive computers to offer longer non-stop

-bottom times.</p></div>

-<div class="admonitionblock">

-<table><tr>

-<td class="icon">

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

-</td>

-<td class="content">If the dive computer itself calculates a ceiling and makes it available to

-<em>Subsurface</em> during upload of dives, this can be shown as a red area by

-checking <strong>Dive computer reported ceiling</strong> button on the Profile Panel.</td>

-</tr></table>

-</div>

-<div class="admonitionblock">

-<table><tr>

-<td class="icon">

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

-</td>

-<td class="content">If the <strong>Calculated ceiling</strong> button on the Profile Panel is clicked, then a

-ceiling, calculated by <em>Subsurface</em>, is shown in green if it exists for a

-particular dive (<strong>A</strong> in figure below). This setting can be modified in two

-ways:</td>

-</tr></table>

-</div>

-<div class="admonitionblock">

-<table><tr>

-<td class="icon">

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

-</td>

-<td class="content">If, in addition, the <strong>show all tissues</strong> button on the Profile Panel is

-clicked, the ceiling is shown for the tissue compartments following the

-Bühlmann model (<strong>B</strong> in figure below).</td>

-</tr></table>

-</div>

-<div class="admonitionblock">

-<table><tr>

-<td class="icon">

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

-</td>

-<td class="content">If, in addition, the <strong>3m increments</strong> button on the Profile Panel is clicked,

-then the ceiling is indicated in 3 m increments (<strong>C</strong> in figure below).</td>

-</tr></table>

-</div>

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

-<div class="content">

-<img src="images/Ceilings2.jpg" alt="Figure: Ceiling with 3m resolution" />

-</div>

-</div>

-<div class="admonitionblock">

-<table><tr>

-<td class="icon">

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

-</td>

-<td class="content">By selecting this icon, the different cylinders used during a dive can be

-represented as a coloured bar at the bottom of the <strong>Dive Profile</strong>. In

-general oxygen is represented by a green bar, nitrogen with a yellow bar and

-helium with a red bar. The image below shows a dive which first uses a

-trimix cylinder (red and green), followed by a switch to a nitrox cylinder

-(yellow and green) after 23 minutes. Cylinders with air are shown as a light

-blue bar.</td>

-</tr></table>

-</div>

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

-<div class="content">

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

-</div>

-</div>

-<div class="admonitionblock">

-<table><tr>

-<td class="icon">

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

-</td>

-<td class="content">Display inert gas tissue pressures relative to ambient inert gas pressure

-(horizontal grey line).  Tissue pressures are calculated using the Bühlmann

-ZH-L16 algorithm and are displayed as lines ranging from green (faster

-tissues) to blue (slower tissues).  The black line, graphed above the

-ambient pressure, is the maximum allowable tissue supersaturation (pressure

-limit) derived from the gradient factors specified in the <strong>Preferences</strong>. For

-divers involved in planned decompression diving, efficient rates of

-offgasing are obtained with tissue pressures between the ambient inert gas

-pressure (grey line) and the pressure limit (black line). This display is a

-representation of the tissue pressures during the whole dive. In contast,

-the <a href="#S_gas_pressure_graph">Gas Pressure Graph</a> in the <strong>Information Box</strong>

-on the <strong>Dive Profile</strong> is an instantaneous reflection of tissue pressures at

-the moment in time reflected by the position of the cursor on the dive

-profile.</td>

-</tr></table>

-</div>

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

-<div class="content">

-<img src="images/tissuesGraph.jpg" alt="Figure: Inert gas tissue pressure graph" />

-</div>

-</div>

-<div class="paragraph"><p>Gradient Factor settings strongly affect the calculated ceilings and their

-depths.  For more information about Gradient factors, see the section on

-<a href="#S_GradientFactors">Gradient Factor Preference settings</a>. The currently

-used gradient factors (e.g. GF 35/75) are shown above the depth profile if

-the appropriate toolbar buttons are activated.  <strong>N.B.:</strong> The indicated

-gradient factors are NOT the gradient factors in use by the dive computer,

-but those used by <em>Subsurface</em> to calculate deco obligations during the

-dive. For more information external to this manual see:</p></div>

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

-<li>

-<p>

-<a href="http://www.tek-dive.com/portal/upload/M-Values.pdf">Understanding M-values by Erik Baker, <em>Immersed</em> Vol. 3, No. 3.</a>

-</p>

-</li>

-<li>

-<p>

-<a href="http://www.rebreatherworld.com/general-and-new-to-rebreather-articles/5037-gradient-factors-for-dummies.html">Gradient factors for dummies, by Kevin Watts</a>

-</p>

-</li>

-</ul></div>

-</div>

-<div class="sect2">

+done by dragging the red dots to the two points on the dive profile that the
+user wishes to measure. Information is then given in the horizontal white
+area underneath the two red dots.</td>
+</tr></table>
+</div>
+<div class="admonitionblock">
+<table><tr>
+<td class="icon">
+<img src="images/icons/ShowPhotos.png" alt="Note" />
+</td>
+<td class="content">Photographs that have been added to a dive can be shown on the profile by
+selecting the <strong>Show-photo</strong> button. The position of a photo on the profile
+indicates the exact time when this photo was taken. If this button is not
+active, the photos are hidden.</td>
+</tr></table>
+</div>
+<div class="paragraph"><p>The profile can also include the dive computer reported <strong>ceiling</strong> (more
+precisely, the deepest deco stop that the dive computer calculated for each
+particular moment in time) as a red overlay on the dive profile. Ascent
+ceilings arise when a direct ascent to the surface increases the risk of a
+diver suffering from decompression sickness (DCS) and it is necessary to
+either ascend slower or to perform decompression stop(s) before ascending to
+the surface. Not all dive computers record this information and make it
+available for download; for example all of the Suunto dive computers fail to
+make this very useful data available to divelog software. <em>Subsurface</em> also
+calculates ceilings independently, shown as a green overlay on the dive
+profile.  Because of the differences in algorithms used and amount of data
+available (and other factors taken into consideration at the time of the
+calculation) it is unlikely that ceilings from dive computers and from
+<em>Subsurface</em> are the same, even if the same algorithm and <em>gradient factors</em>
+(see below) are used.  It is also quite common that <em>Subsurface</em> calculates
+a ceiling for non-decompression dives when the dive computer stayed in
+non-deco mode during the whole dive (represented by the <span class="green">dark green</span>
+section in the profile at the beginning of this section). This is caused by
+the fact that <em>Subsurface’s</em> calculations describe the deco obligation at
+each moment during a dive, while dive computers usually take the upcoming
+ascent into account. During the ascent some excess nitrogen (and possibly
+helium) are already breathed off so even though the diver technically
+encountered a ceiling at depth, the dive still does not require an explicit
+deco stop. This feature allows dive computers to offer longer non-stop
+bottom times.</p></div>
+<div class="admonitionblock">
+<table><tr>
+<td class="icon">
+<img src="images/icons/cceiling.jpg" alt="Note" />
+</td>
+<td class="content">If the dive computer itself calculates a ceiling and makes it available to
+<em>Subsurface</em> during upload of dives, this can be shown as a red area by
+checking <strong>Dive computer reported ceiling</strong> button on the Profile Panel.</td>
+</tr></table>
+</div>
+<div class="admonitionblock">
+<table><tr>
+<td class="icon">
+<img src="images/icons/ceiling1.jpg" alt="Note" />
+</td>
+<td class="content">If the <strong>Calculated ceiling</strong> button on the Profile Panel is clicked, then a
+ceiling, calculated by <em>Subsurface</em>, is shown in green if it exists for a
+particular dive (<strong>A</strong> in figure below). This setting can be modified in two
+ways:</td>
+</tr></table>
+</div>
+<div class="admonitionblock">
+<table><tr>
+<td class="icon">
+<img src="images/icons/ceiling2.jpg" alt="Note" />
+</td>
+<td class="content">If, in addition, the <strong>show all tissues</strong> button on the Profile Panel is
+clicked, the ceiling is shown for the tissue compartments following the
+Bühlmann model (<strong>B</strong> in figure below).</td>
+</tr></table>
+</div>
+<div class="admonitionblock">
+<table><tr>
+<td class="icon">
+<img src="images/icons/ceiling3.jpg" alt="Note" />
+</td>
+<td class="content">If, in addition, the <strong>3m increments</strong> button on the Profile Panel is clicked,
+then the ceiling is indicated in 3 m increments (<strong>C</strong> in figure below).</td>
+</tr></table>
+</div>
+<div class="imageblock" style="text-align:center;">
+<div class="content">
+<img src="images/Ceilings2.jpg" alt="Figure: Ceiling with 3m resolution" />
+</div>
+</div>
+<div class="admonitionblock">
+<table><tr>
+<td class="icon">
+<img src="images/icons/ShowCylindersButton.jpg" alt="Note" />
+</td>
+<td class="content">By selecting this icon, the different cylinders used during a dive can be
+represented as a coloured bar at the bottom of the <strong>Dive Profile</strong>. In
+general oxygen is represented by a green bar, nitrogen with a yellow bar and
+helium with a red bar. The image below shows a dive which first uses a
+trimix cylinder (red and green), followed by a switch to a nitrox cylinder
+(yellow and green) after 23 minutes. Cylinders with air are shown as a light
+blue bar.</td>
+</tr></table>
+</div>
+<div class="imageblock" style="text-align:center;">
+<div class="content">
+<img src="images/ShowCylinders_f20.jpg" alt="Figure: Cylinder use graph" />
+</div>
+</div>
+<div class="admonitionblock">
+<table><tr>
+<td class="icon">
+<img src="images/tissues.jpg" alt="Note" />
+</td>
+<td class="content">Display inert gas tissue pressures relative to ambient inert gas pressure
+(horizontal grey line).  Tissue pressures are calculated using the Bühlmann
+ZH-L16 algorithm and are displayed as lines ranging from green (faster
+tissues) to blue (slower tissues).  The black line, graphed above the
+ambient pressure, is the maximum allowable tissue supersaturation (pressure
+limit) derived from the gradient factors specified in the <strong>Preferences</strong>. For
+divers involved in planned decompression diving, efficient rates of
+offgasing are obtained with tissue pressures between the ambient inert gas
+pressure (grey line) and the pressure limit (black line). This display is a
+representation of the tissue pressures during the whole dive. In contrast,
+the <a href="#S_gas_pressure_graph">Gas Pressure Graph</a> in the <strong>Information Box</strong>
+on the <strong>Dive Profile</strong> is an instantaneous reflection of tissue pressures at
+the moment in time reflected by the position of the cursor on the dive
+profile.</td>
+</tr></table>
+</div>
+<div class="imageblock" style="text-align:center;">
+<div class="content">
+<img src="images/tissuesGraph.jpg" alt="Figure: Inert gas tissue pressure graph" />
+</div>
+</div>
+<div class="paragraph"><p>Gradient Factor settings strongly affect the calculated ceilings and their
+depths.  For more information about Gradient factors, see the section on
+<a href="#S_GradientFactors">Gradient Factor Preference settings</a>. The currently
+used gradient factors (e.g. GF 35/75) are shown above the depth profile if
+the appropriate toolbar buttons are activated.  <strong>N.B.:</strong> The indicated
+gradient factors are NOT the gradient factors in use by the dive computer,
+but those used by <em>Subsurface</em> to calculate deco obligations during the
+dive. For more information external to this manual see:</p></div>
+<div class="ulist"><ul>
+<li>
+<p>
+<a href="http://www.tek-dive.com/portal/upload/M-Values.pdf">Understanding M-values by Erik Baker, <em>Immersed</em> Vol. 3, No. 3.</a>
+</p>
+</li>
+<li>
+<p>
+<a href="http://www.rebreatherworld.com/general-and-new-to-rebreather-articles/5037-gradient-factors-for-dummies.html">Gradient factors for dummies, by Kevin Watts</a>
+</p>
+</li>
+</ul></div>
+</div>
+<div class="sect2">
 <h3 id="_the_dive_profile_context_menu">6.5. The Dive Profile context menu</h3>
 <div class="paragraph"><p>The context menu for the Dive Profile is accessed by right-clicking while
 the mouse cursor is over the Dive Profile panel. The menu allows the
@@ -3167,30 +3167,30 @@ dive profile. Normally the Information Box is located to the top left of the
 panel, then only the top line of the Information Box is visible (see
 left-hand part of figure (<strong>A</strong>) below). The Information Box can be moved
 around in the <strong>Dive Profile</strong> panel by click-dragging it with the mouse so
-that it is not obstructing important detail. The position of the Information

-Box is saved and used again during subsequent dive analyses.</p></div>

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

-<div class="content">

-<img src="images/InfoBox2.jpg" alt="Figure: Information Box" />

-</div>

-</div>

-<div class="paragraph"><p>The moment the mouse points inside the <strong>Dive Profile</strong> panel, the information

-box expands and shows many data items. In this situation, the data reflect

-the time point along the dive profile indicated by the mouse cursor (see

-right-hand part of figure (<strong>B</strong>) above where the Information Box reflects the

-situation at the position of the cursor [arrow] in that image). Therefore,

-moving the cursor in the horizontal direction allows the Information Box to

-show information for any point along the dive profile.  In this mode, the

-Information Box gives extensive statistics about depth, gas and ceiling

-characteristics of the particular dive. These include: Time period into the

-dive (indicated by a @), depth, cylinder pressure (P), temperature,

-ascent/descent rate, surface air consumption (SAC), oxygen partial pressure,

-maximum operating depth, equivalent air depth (EAD), equivalent narcotic

-depth (END), equivalent air density depth (EADD), decompression requirements

-at that instant in time (Deco), time to surface (TTS), the calculated

-ceiling, as well as the calculated ceiling for several Bühlmann tissue

-compartments.</p></div>

-<div class="paragraph"><p>The user has control over the display of several statistics, represented as

+that it is not obstructing important detail. The position of the Information
+Box is saved and used again during subsequent dive analyses.</p></div>
+<div class="imageblock" style="text-align:center;">
+<div class="content">
+<img src="images/InfoBox2.jpg" alt="Figure: Information Box" />
+</div>
+</div>
+<div class="paragraph"><p>The moment the mouse points inside the <strong>Dive Profile</strong> panel, the information
+box expands and shows many data items. In this situation, the data reflect
+the time point along the dive profile indicated by the mouse cursor (see
+right-hand part of figure (<strong>B</strong>) above where the Information Box reflects the
+situation at the position of the cursor [arrow] in that image). Therefore,
+moving the cursor in the horizontal direction allows the Information Box to
+show information for any point along the dive profile.  In this mode, the
+Information Box gives extensive statistics about depth, gas and ceiling
+characteristics of the particular dive. These include: Time period into the
+dive (indicated by a @), depth, cylinder pressure (P), temperature,
+ascent/descent rate, surface air consumption (SAC), oxygen partial pressure,
+maximum operating depth, equivalent air depth (EAD), equivalent narcotic
+depth (END), equivalent air density depth (EADD), decompression requirements
+at that instant in time (Deco), time to surface (TTS), the calculated
+ceiling, as well as the calculated ceiling for several Bühlmann tissue
+compartments.</p></div>
+<div class="paragraph"><p>The user has control over the display of several statistics, represented as
 four buttons on the left of the profile panel. These are:</p></div>
 <div class="admonitionblock">
 <table><tr>
@@ -3213,85 +3213,85 @@ increased risk of exposure to the dangers associated with oxygen toxicity.</td>
 </td>
 <td class="content">Clicking this button causes the Information Box to display the <strong>No-deco
 Limit (NDL)</strong> or the <strong>Total Time to Surface (TTS)</strong>. NDL is the time duration
-that a diver can continue with a dive, given the present depth, that does

-not require decompression (that is, before an ascent ceiling appears). Once

-one has exceeded the NDL and decompression is required (that is, there is an

-ascent ceiling above the diver, then TTS gives the number of minutes

-required before the diver can surface. TTS includes ascent time as well as

-decompression time.</td>

-</tr></table>

-</div>

-<div class="admonitionblock">

-<table><tr>

-<td class="icon">

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

-</td>

-<td class="content">Clicking this button causes the Information Box to display the <strong>Surface Air

-Consumption (SAC)</strong>.  SAC is an indication of the surface-normalised

-respiration rate of a diver. The value of SAC is less than the real

-respiration rate because a diver at 10m uses breathing gas at a rate roughly

-double that of the equivalent rate at the surface. SAC gives an indication

-of breathing gas consumption rate independent of the depth of the dive so

-that the respiratory rates of different dives can be compared. The units for

-SAC is litres/min or cub ft/min.</td>

-</tr></table>

-</div>

-<div class="admonitionblock">

-<table><tr>

-<td class="icon">

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

-</td>

-<td class="content">Clicking this button displays the <strong>Equivalent Air Depth (EAD)</strong> for nitrox

-dives as well as the <strong>Equivalent Narcotic Depth (END)</strong> for trimix

-dives. These are numbers of importance to divers who use breathing gases

-other than air. Their values are dependent on the composition of the

-breathing gas.  The EAD is the depth of a hypothetical air dive that has the

-same partial pressure of nitrogen as the current depth of the nitrox dive at

-hand. A nitrox dive leads to the same decompression obligation as an air

-dive to the depth 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>

-<div class="paragraph"><p>On the left of the <strong>Information Box</strong> is a vertical bar graph indicating the

-pressures of the nitrogen (and other inert gases, e.g. helium, if

-applicable) that the diver was inhaling <em>at a particular instant during the

-dive</em>, indicated by the position of the cursor on the <strong>Dive Profile</strong>. The

-drawing on the left below indicates the meaning of the different parts of

-the Gas Pressure Bar Graph.</p></div>

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

-<div class="content">

-<img src="images/GasPressureBarGraph.jpg" alt="FIGURE:Gas Pressure bar Graph" />

-</div>

-</div>

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

-<li>

-<p>

-The light green area indicates the total gas, with the top margin of the

-  light green area indicating the total gas pressure inhaled by the diver and

-  measured from the bottom of the graph to the top of the light green

-  area. This pressure has a <em>relative</em> value in the graph and does not

-  indicate absolute pressure.

-</p>

-</li>

-<li>

-<p>

-The horizontal black line underneath the light green margin indicates the

-  equilibrium pressure of the inert gases inhaled by the diver, usually

-  nitrogen. In the case of trimix, it is the pressures of nitrogen and helium

-  combined. In this example, the user is diving with EAN32, so the inert gas

-  pressure is 68% of the distance from the bottom of the graph to the total

-  gas pressure value.

-</p>

-</li>

-<li>

-<p>

+that a diver can continue with a dive, given the present depth, that does
+not require decompression (that is, before an ascent ceiling appears). Once
+one has exceeded the NDL and decompression is required (that is, there is an
+ascent ceiling above the diver, then TTS gives the number of minutes
+required before the diver can surface. TTS includes ascent time as well as
+decompression time.</td>
+</tr></table>
+</div>
+<div class="admonitionblock">
+<table><tr>
+<td class="icon">
+<img src="images/icons/SAC.jpg" alt="Note" />
+</td>
+<td class="content">Clicking this button causes the Information Box to display the <strong>Surface Air
+Consumption (SAC)</strong>.  SAC is an indication of the surface-normalised
+respiration rate of a diver. The value of SAC is less than the real
+respiration rate because a diver at 10m uses breathing gas at a rate roughly
+double that of the equivalent rate at the surface. SAC gives an indication
+of breathing gas consumption rate independent of the depth of the dive so
+that the respiratory rates of different dives can be compared. The units for
+SAC is litres/min or cub ft/min.</td>
+</tr></table>
+</div>
+<div class="admonitionblock">
+<table><tr>
+<td class="icon">
+<img src="images/icons/EAD.jpg" alt="Note" />
+</td>
+<td class="content">Clicking this button displays the <strong>Equivalent Air Depth (EAD)</strong> for nitrox
+dives as well as the <strong>Equivalent Narcotic Depth (END)</strong> for trimix
+dives. These are numbers of importance to divers who use breathing gases
+other than air. Their values are dependent on the composition of the
+breathing gas.  The EAD is the depth of a hypothetical air dive that has the
+same partial pressure of nitrogen as the current depth of the nitrox dive at
+hand. A nitrox dive leads to the same decompression obligation as an air
+dive to the depth equalling the EAD. The END is the depth of a hypothetical
+air dive that has the same sum of partial pressures of the narcotic gases
+nitrogen and oxygen as the current trimix dive. A trimix diver can expect
+the same narcotic effect as a diver breathing air diving at a depth
+equalling the END.</td>
+</tr></table>
+</div>
+<div class="paragraph"><p>Figure (<strong>B</strong>) above shows an information box with a nearly complete set of
+data.</p></div>
+<div class="sect3">
+<h4 id="S_gas_pressure_graph">6.6.1. The Gas Pressure Bar Graph</h4>
+<div class="paragraph"><p>On the left of the <strong>Information Box</strong> is a vertical bar graph indicating the
+pressures of the nitrogen (and other inert gases, e.g. helium, if
+applicable) that the diver was inhaling <em>at a particular instant during the
+dive</em>, indicated by the position of the cursor on the <strong>Dive Profile</strong>. The
+drawing on the left below indicates the meaning of the different parts of
+the Gas Pressure Bar Graph.</p></div>
+<div class="imageblock" style="text-align:center;">
+<div class="content">
+<img src="images/GasPressureBarGraph.jpg" alt="FIGURE:Gas Pressure bar Graph" />
+</div>
+</div>
+<div class="ulist"><ul>
+<li>
+<p>
+The light green area indicates the total gas, with the top margin of the
+  light green area indicating the total gas pressure inhaled by the diver and
+  measured from the bottom of the graph to the top of the light green
+  area. This pressure has a <em>relative</em> value in the graph and does not
+  indicate absolute pressure.
+</p>
+</li>
+<li>
+<p>
+The horizontal black line underneath the light green margin indicates the
+  equilibrium pressure of the inert gases inhaled by the diver, usually
+  nitrogen. In the case of trimix, it is the pressures of nitrogen and helium
+  combined. In this example, the user is diving with EAN32, so the inert gas
+  pressure is 68% of the distance from the bottom of the graph to the total
+  gas pressure value.
+</p>
+</li>
+<li>
+<p>
 The dark green area at the bottom of the graph represents the pressures of
   inert gas in each of the 16 tissue compartments, following the Bühlmann
   algorithm, the fast tissues being on the left hand side.
@@ -3301,7 +3301,7 @@ The dark green area at the bottom of the graph represents the pressures of
 <p>
 The top black horizontal line indicates the gradient factor that applies to
   the depth of the diver at the particular point on the <strong>Dive Profile</strong>. The
-  gradient factor shown is an interpolation between the FGLow and GFHigh
+  gradient factor shown is an interpolation between the GFLow and GFHigh
   values specified in the Graph tab of the <strong>Preferences Panel</strong> of
   <strong>Subsurface</strong>.
 </p>
@@ -3311,35 +3311,35 @@ The top black horizontal line indicates the gradient factor that applies to
 The bottom margin of the red area in the graph indicates the Bühlman-derived
   M-value, that is the pressure value of inert gases at which bubble formation
   is expected to be severe, resulting in decompression sickness.
-</p>

-</li>

-</ul></div>

-<div class="paragraph"><p>These five values are indicated on the left in the graph above. The way the

-Gas Pressure Bar Graph changes during a dive is indicated on the right hand

-side of the above figure for a diver using EAN32.</p></div>

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

-<li>

-<p>

-Graph <strong>A</strong> indicates the situation at the start of a dive with diver at the

-  surface. The pressures in all the tissue compartments are still at the

-  equilibrium pressure because no diving has taken place.

-</p>

-</li>

-<li>

-<p>

-Graph <strong>B</strong> indicates the situation after a descent to 30 meters. Few of the

-  tissue compartments have had time to respond to the descent, their gas

-  pressures being far below the equilibrium gas pressure.

-</p>

-</li>

-<li>

-<p>

-Graph <strong>C</strong> represents the pressures after 30 minutes at 30 m. The fast

-  compartments have attained equilibrium (i.e. they have reached the hight of

-  the black line indicating the equilibrium pressure). The slower compartments

-  (towards the right) have not reached equilibrium and are in the process of

-  slowly increasing in pressure.

-</p>

+</p>
+</li>
+</ul></div>
+<div class="paragraph"><p>These five values are indicated on the left in the graph above. The way the
+Gas Pressure Bar Graph changes during a dive is indicated on the right hand
+side of the above figure for a diver using EAN32.</p></div>
+<div class="ulist"><ul>
+<li>
+<p>
+Graph <strong>A</strong> indicates the situation at the start of a dive with diver at the
+  surface. The pressures in all the tissue compartments are still at the
+  equilibrium pressure because no diving has taken place.
+</p>
+</li>
+<li>
+<p>
+Graph <strong>B</strong> indicates the situation after a descent to 30 meters. Few of the
+  tissue compartments have had time to respond to the descent, their gas
+  pressures being far below the equilibrium gas pressure.
+</p>
+</li>
+<li>
+<p>
+Graph <strong>C</strong> represents the pressures after 30 minutes at 30 m. The fast
+  compartments have attained equilibrium (i.e. they have reached the hight of
+  the black line indicating the equilibrium pressure). The slower compartments
+  (towards the right) have not reached equilibrium and are in the process of
+  slowly increasing in pressure.
+</p>
 </li>
 <li>
 <p>
@@ -3373,10 +3373,11 @@ Graph <strong>E</strong> indicates the situation after remaining at 4.5 meters f
 <div class="paragraph"><p>Several actions on either a single dive or a group of dives can be performed
 using the Dive List Context Menu, found by selecting either a single dive or
 a group of dives and then right-clicking.</p></div>
-<div class="paragraph"><p><span class="image">
-<img src=":images/ContextMenu.jpg" alt="Figure : Menu contextuel" />
-</span> #
-NEEDS REPLACEMENT</p></div>
+<div class="imageblock" style="text-align:center;">
+<div class="content">
+<img src="images/ContextMenu.jpg" alt="Figure: Context Menu" />
+</div>
+</div>
 <div class="paragraph"><p>The context menu is used in many manipulations described below.</p></div>
 <div class="sect3">
 <h4 id="_customising_the_columns_showed_in_the_strong_dive_list_strong_panel">7.1.1. Customising the columns showed in the <strong>Dive List</strong> panel</h4>
@@ -3805,12 +3806,12 @@ Open the <strong>Network Preferences</strong> by selecting <em>File</em> &#8594;
 <li>
 <p>
 In the section headed <em>Subsurface cloud storage</em>, enter an email address that
-   _Su bsurface can use for user registration.
+   <em>Subsurface</em> can use for user registration.
 </p>
 </li>
 <li>
 <p>
-Enter a novel password that_Subsurface_ will use to store the
+Enter a novel password that <em>Subsurface</em> will use to store the
   dive log in the cloud.
 </p>
 </li>
@@ -4002,7 +4003,7 @@ several templates (see image <strong>B</strong>, above).</p></div>
 <div class="ulist"><ul>
 <li>
 <p>
-<em>Flow layout</em>: Print the text associated with each diev without printing the
+<em>Flow layout</em>: Print the text associated with each dive without printing the
   dive profiles
      of each dive (see below):
 </p>
@@ -4055,7 +4056,7 @@ operating system, allowing one to choose a printer and to set its properties
 (see image below):</p></div>
 <div class="imageblock" style="text-align:center;">
 <div class="content">
-<img src="images/Print_print_f22.jpg" alt="FIGURE: Print one dive / page" />
+<img src="images/Print_print_f22.jpg" alt="FIGURE: Print dialog" />
 </div>
 </div>
 <div class="paragraph"><p>Set the print resolution of the printer to an appropriate value by changing
@@ -4177,7 +4178,7 @@ leave the settings panel by selecting <strong>OK</strong>.</p></div>
 <li>
 <p>
 <em>Local default file</em>: When checked, <em>Subsurface</em> automatically loads a dive log from the local hard disk
-       as descibed above.
+       as described above.
 </p>
 </li>
 <li>
@@ -4236,8 +4237,8 @@ button, units can be selected independently, with some units in the metric
 system and others in imperial.</p></div>
 <div class="paragraph"><p>Irrespective of the above settings, dive time measurements can be either in
 seconds or minutes.  Choose the appropriate option. GPS coordinates can be
-represented either as traditionla coordinates (degrees, minutes, seconds) or
-as decimal degrees Choose the appropiate option.</p></div>
+represented either as traditional coordinates (degrees, minutes, seconds) or
+as decimal degrees Choose the appropriate option.</p></div>
 </div>
 <div class="sect2">
 <h3 id="_graph">12.3. Graph</h3>
@@ -4400,8 +4401,8 @@ from one&#8217;s ISP.
 <div class="ulist"><ul>
 <li>
 <p>
-Sync to cloud in the background_: This option allows saving of dive information to the cloud storage
-   while the user performs other tatsks inside <em>Subsurface</em>.
+<em>Sync to cloud in the background</em>: This option allows saving of dive information to the cloud storage
+   while the user performs other tasks inside <em>Subsurface</em>.
 </p>
 </li>
 <li>
@@ -4440,7 +4441,7 @@ plongée vers Facebook</a> pour plus d&#8217;informations.</p></div>
 </div>
 <div class="sect2">
 <h3 id="_georeference">12.7. Georeference</h3>
-<div class="paragraph"><p>_Subsurface provides a geo-lookup service (that is, an ability to look up
+<div class="paragraph"><p><em>Subsurface</em> provides a geo-lookup service (that is, an ability to look up
 the geographic coordinates of a place name).</p></div>
 </div>
 </div>
@@ -4565,14 +4566,15 @@ In the top left-hand area of the planning screen, ensure that the constant
 </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.
+In the table labelled <em>Available Gases</em>, add the information of the
+  cylinders to be used as well as the gas composition within that
+  cylinder. This is done in a similar way as for <a href="#S_CylinderData">providing   cylinder data for dive logs</a>. Choose the cylinder type by double clicking
+  the cylinder type and using the dropdown list, then specify the work
+  pressure of this cylinder. By leaving the oxygen concentration (O2%) filed
+  empty, the cylinder is assumed to contain air. Otherwise enter the oxygen
+  and/or helium concentration in the boxes provided in this dialogue. Add
+  additional cylinders by using the "+" icon to the top righthand of the
+  dialogue.
 </p>
 </li>
 <li>
@@ -4711,7 +4713,7 @@ A very low GFLow value brings about decompression stops early on during the dive
  ** For more information about Gradient factors, see the section on <a href="#S_GradientFactors">Gradient Factor Preference settings</a>.</p></div>
 <div class="paragraph"><p>If the VPM-B model is selected, the Conservatism_level needs to be specified
 on a scale of 0 (least conservative) to 4 (most conservative).  This model
-tends to give deco stops at deeper levels than the Beuhlmann model and often
+tends to give deco stops at deeper levels than the Bühlmann model and often
 results in slightly shorter dive durations than the Bühlmann model. When
 selecting one of these models, keep in mind that they are NOT exact
 physiological models but only mathematical models that appear to work in
@@ -4774,7 +4776,7 @@ in the bue design surface to the top right hand of the screen. The white
 dots (waypoints) on the profile can be dragged with a mouse. Create more
 waypoints by double-clicking on the profile line and ensuring that the
 profile reflects the intended dive. Drag the waypoints to represent the
-depth and duration of the dive. It is NOt necessary to specify the ascent
+depth and duration of the dive. It is NOT necessary to specify the ascent
 part of the dive since the planner calculates this, based on the settings
 that have been specified.  If any of the management limits (for nitrogen,
 oxygen or gas) is exceeded, the surface above the dive profile changes from
@@ -4786,7 +4788,7 @@ specified in the <em>Available Gases</em> table.  Add new waypoints until the ma
 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
+points in order to fulfil decompression requirements for that dive. A
 waypoint can be moved by selecting that waypoint and by using the arrow
 keys.  The waypoints listed in the <em>Dive Planner Points</em> dialogue can be
 edited by hand in order to obtain a precise presentation of the dive
@@ -4837,7 +4839,7 @@ from the segment durations at a particular level.</p></div>
 <h3 id="_planning_pscr_dives">13.3. Planning pSCR dives</h3>
 <div class="paragraph"><p>To plan a dive using a passive semi-closed rebreather (pSCR), select <em>pSCR</em> rather than
 <em>Open circuit</em> in the dropdown list.
-The parameters of the pSCR diver can be set by selecting  <em>File &#8594;   Preferences &#8594;   Graph</em>
+The parameters of the pSCR dive can be set by selecting  <em>File &#8594;   Preferences &#8594;   Graph</em>
 from the main menu, where the gas consumption calculation takes into account the pSCR dump
 ratio (default 10:1) as well as the metabolism rate. The calculation also takes the oxygen drop
 accross the mouthpiece of the rebreather into account. If the
@@ -5350,7 +5352,7 @@ vous devriez pouvoir importer vos plongées.</p></div>
 <td class="icon">
 <img src="images/icons/bluetooth.jpg" alt="Note" />
 </td>
-<td class="content">For dive computers communicating through bluetooth like the Heinrichs
+<td class="content">For dive computers communicating through Bluetooth like the Heinrichs
 Weikamp Frog or the Shearwater Predator and Petrel there is a different
 procedure to get the devices name to communicate with <em>Subsurface</em>. Follow
 these steps:</td>
@@ -5413,7 +5415,7 @@ process.</p></div>
 <div class="ulist"><ul>
 <li>
 <p>
-Enable the Bluetooth controller and pair your dive computer&lt;/li&gt;
+Enable the Bluetooth controller and pair your dive computer
 </p>
 </li>
 <li>
@@ -5436,7 +5438,7 @@ the display reads <em>Sending</em> then <em>Sent Dive</em>.</p></div>
 <div class="paragraph"><p>To establish the connection, establish root access through <code>sudo</code> or <code>su</code>.
 The correct permission is required to download the dives in the computer. On
 most Linux systems this means becoming a member of the dialout group (This
-is identical as for many dive computers using a Linux USB port, descibed in
+is identical as for many dive computers using a Linux USB port, described in
 the previous section). On the command terminal, enter:</p></div>
 <div class="paragraph"><p><code>sudo usermod -a -G dialout username</code></p></div>
 <div class="paragraph"><p>Then log out and log in for the change to take effect.</p></div>
@@ -5475,7 +5477,7 @@ hci0:  Type: BR/EDR  Bus: USB
         RX bytes:1026 acl:0 sco:0 events:47 errors:0
         TX bytes:449 acl:0 sco:0 commands:46 errors:0</code></pre>
 </div></div>
-<div class="paragraph"><p><code>Check that the status now includes +<em>UP</em>, <em>RUNNING</em> AND <em>AUTH</em></code>.</p></div>
+<div class="paragraph"><p>Check that the status now includes <code><em>UP</em>, <em>RUNNING</em> AND <em>AUTH</em></code>.</p></div>
 <div class="paragraph"><p>If there are multiple controllers running, it&#8217;s easiest to off the unused
 controller(s). For example, for <code>hci1</code>:</p></div>
 <div class="literalblock">
@@ -5529,22 +5531,22 @@ Scanning ...
 <div class="ulist"><ul>
 <li>
 <p>
-&lt;controller&gt;+ is the Bluetooth controller, <code>hci0</code>.
+<code>&lt;controller&gt;</code> is the Bluetooth controller, <code>hci0</code>.
 </p>
 </li>
 <li>
 <p>
-&lt;dev&gt; is the RFCOMM device file, <code>rfcomm0</code>
+<code>&lt;dev&gt;</code> is the RFCOMM device file, <code>rfcomm0</code>
 </p>
 </li>
 <li>
 <p>
-&lt;bdaddr&gt; is the dive computer&#8217;s MAC address, <code>00:11:22:33:44:55</code>
+<code>&lt;bdaddr&gt;</code> is the dive computer&#8217;s MAC address, <code>00:11:22:33:44:55</code>
 </p>
 </li>
 <li>
 <p>
-[channel] is the dive computer&#8217;s Bluetooth channel we need to connect to.
+<code>[channel]</code> is the dive computer&#8217;s Bluetooth channel we need to connect to.
 </p>
 </li>
 </ul></div>
@@ -5608,7 +5610,7 @@ listed is not correct, please let the Subsurface developers know on the user
 forum or the developer mailing list <em>subsurface@subsurface-divelog.org</em>.</p></div>
 </div>
 <div class="sect4">
-<h5 id="_download_the_dives_with_subsurface_lt_em_gt">Download the dives with Subsurface&lt;/em&gt;</h5>
+<h5 id="_download_the_dives_with_subsurface">Download the dives with Subsurface</h5>
 <div class="paragraph"><p>After establishing the RFCOMM connection and while the dive computer&#8217;s
 upload mode countdown is still running, go to_Subsurface_, select
 <em>Import&#8594;Import from dive computer</em> and enter appropriate Vendor
@@ -6740,7 +6742,7 @@ and duration of the dives. Once the memory is full the oldest dives get
 overwritten with new dives. Thus we are only able to download the last 13,
 30 or 199 dives.</p></div>
 <div class="paragraph"><p>If you have downloaded your dives to different dive logging software before
-they were overwritten, there is a high change that Subsurface can import
+they were overwritten, there is a high chance that Subsurface can import
 these. However, if the logs are only on your dive computer, they cannot be
 salvaged after being over written by new dives.</p></div>
 </div>
@@ -6750,7 +6752,7 @@ salvaged after being over written by new dives.</p></div>
 <div id="footnotes"><hr /></div>
 <div id="footer">
 <div id="footer-text">
-Last updated 2015-10-05 10:06:08 CEST
+Last updated 2015-10-12 11:05:42 CEST
 </div>
 </div>
 </body>