diff --git a/Documentation/user-manual.html.git b/Documentation/user-manual.html.git
index 04e12aa5b..ba678a6ef 100644
--- a/Documentation/user-manual.html.git
+++ b/Documentation/user-manual.html.git
@@ -202,6 +202,40 @@ ol.upperroman               { list-style-type: upper-roman; }
 .hdlist td                  { vertical-align: top; }
 
 
+@media screen {
+  body {
+    max-width: 50em; /* approximately 80 characters wide */
+    margin-left: 16em;
+  }
+
+  #toc {
+    position: fixed;
+    top: 0;
+    left: 0;
+    bottom: 0;
+    width: 13em;
+    padding: 0.5em;
+    padding-bottom: 1.5em;
+    margin: 0;
+    overflow: auto;
+    border-right: 3px solid #f8f8f8;
+    background-color: white;
+  }
+
+  #toc .toclevel1 {
+    margin-top: 0.5em;
+  }
+
+  #toc .toclevel2 {
+    margin-top: 0.25em;
+    display: list-item;
+    color: #aaaaaa;
+  }
+
+  #toctitle {
+    margin-top: 0.5em;
+  }
+}
 </style>
 <script type="text/javascript">
 /*<![CDATA[*/
@@ -412,14 +446,14 @@ asciidoc.install(3);
 Linus Torvalds, Miika Turkia, Amit Chaudhuri, Jan Schubert, Salvador Cuñat, Pedro Neves</p></div>
 <div class="paragraph"><p><span class="blue"><em>Version 4.5, October 2015</em></span></p></div>
 <div class="paragraph"><p>Welcome as a user of <em>Subsurface</em>, an advanced dive logging program with
-extensive infrastructure to describe, organise, interpret and print scuba
+extensive infrastructure to describe, organize, interpret and print scuba
 and free dives. <em>Subsurface</em> offers many advantages over other similar
 software solutions:</p></div>
 <div class="ulist"><ul>
 <li>
 <p>
 Do you need a flexible way of logging dives using recreational equipment,
-   even not using a dive computer?
+   even without a dive computer?
 </p>
 </li>
 <li>
@@ -427,43 +461,43 @@ Do you need a flexible way of logging dives using recreational equipment,
 Do you use two different dive computer brands, each with its own proprietary
    software for downloading dive logs? Do you dive with rebreathers as well
    as open circuit or recreational equipment? Do you use a Reefnet Sensus time-depth
-   recorder in conjunction with a dive computer? <em>Subsurface</em> offers a standard
-   interface for downloading dive logs from all these different pieces of
-   equipment and to store and analyse the dive logs within a unified system.
+   recorder along with a dive computer? <em>Subsurface</em> offers a standard
+   interface for downloading dive logs from all of these different pieces of
+   equipment, storing and analyzing the dive logs within a unified system.
 </p>
 </li>
 <li>
 <p>
 Do you use more than one operating system? <em>Subsurface</em> is fully compatible
-   with Mac, Linux and Windows, allowing you to access your dive log on each
-   of your operating systems using a single application.
+   with Mac, Linux and Windows, letting you access your dive log on each
+   operating system using a single application.
 </p>
 </li>
 <li>
 <p>
-Do you use Linux or Mac and your dive computer has only Windows-based software
+Do you use Linux or Mac, but your dive computer has only Windows- based software
    for downloading dive information (e.g. Mares)? <em>Subsurface</em> provides a way of
-   downloading and analysing your dive logs on other operating systems.
+   downloading and analyzing your dive logs on other operating systems.
 </p>
 </li>
 <li>
 <p>
-Do you need an intuitive graphical dive planner that integrates with and takes
-   into account the dives that have already been logged?
+Do you need an intuitive graphical dive planner that integrates with, and takes
+   into account, dives you’ve already logged?
 </p>
 </li>
 <li>
 <p>
-Do you need a way of storing or backing up your dive log on the Internet, allowing
-   you to view your dive log from anywhere, using an Internet browser?
+Do you need a way of storing or backing up your dive log on the Internet, letting
+   you view your dive log from anywhere using an Internet browser?
+<em>Subsurface</em> binaries are available for Windows PCs (Win XP or later), Intel
+based Macs (OS/X) and many Linux distributions. <em>Subsurface</em> can be built for
+many more hardware platforms and software environments where Qt and
+libdivecomputer are available.
 </p>
 </li>
 </ul></div>
-<div class="paragraph"><p><em>Subsurface</em> binaries are available for Windows PCs (Win XP or later), Intel
-based Macs (OS/X) and many Linux distributions. <em>Subsurface</em> can be built for
-many more hardware platforms and software environments where Qt and
-libdivecomputer are available.</p></div>
-<div class="paragraph"><p>The scope of this document is the use of the <em>Subsurface</em> program. To install
+<div class="paragraph"><p>This manual explains how to use the <em>Subsurface</em> program. To install
 the software, consult the <em>Downloads</em> page on the
 <a href="http://subsurface-divelog.org/"><em>Subsurface</em> web site</a>.
 Please discuss issues with this program by sending an email to
@@ -478,28 +512,53 @@ Divers</p></div>
   <noscript><p><b>JavaScript must be enabled in your browser to display the table of contents.</b></p></noscript>
 </div>
 <div class="sect1">
-<h2 id="S_UserSurvey">1. Using this manual</h2>
+<h2 id="_using_this_manual">1. Using this manual</h2>
 <div class="sectionbody">
-<div class="paragraph"><p>When opened from within <em>Subsurface</em>, this manual does not have external controls. However,
-a <em>SEARCH</em> function is important. This is activated by pressing control-F or command-F on
-the keyboard. A text box appears at the bottom of the window. Use this to search for
-any term in the manual.</p></div>
+<div class="paragraph"><p>When opened from within <em>Subsurface</em>, this manual does not have external controls for
+paging or selecting previous pages. However, two facilities are provided:</p></div>
+<div class="ulist"><ul>
+<li>
+<p>
+The <em>SEARCH</em> function is activated by pressing control-F or command-F on
+the keyboard. A text box appears at the bottom right-hand of the window (see image below).
+For instance, typing the word "<em>weights</em>" into the search text
+box, searches throughout the user manual. To the right of the
+search text box are two arrows pointing up and down. These find
+the previous and the next occurrence of the search term.
+<span class="image">
+<img src=":images/usermanualfunctions.jpg" alt="User manual functions" />
+</span>
+</p>
+</li>
+<li>
+<p>
+<em>PREVIOUS/NEXT LINK</em>. Move between links (underlined words that
+jump to specific sections in the user manual) by right-clicking on the text of the manual.
+This brings up a context menu to previous links selected.
+(see image above). For instance if a link has been selected, then the option
+to <em>Go Back</em> shows the text at the last link selected
+(similar to the Previous Page button in a browser). Conversely the <em>Go Forward</em> option
+jumps to the
+text seen before selecting the <em>Go Back</em> option. The <em>Reload</em>
+option reloads the complete user manual into the window.
+</p>
+</li>
+</ul></div>
 </div>
 </div>
 <div class="sect1">
-<h2 id="_the_user_survey">2. The user survey</h2>
+<h2 id="S_UserSurvey">2. The user survey</h2>
 <div class="sectionbody">
-<div class="paragraph"><p>In order to develop <em>Subsurface</em> in a way that serves its users in the best possible way,
-it is important to have some user information. Upon launching <em>Subsurface</em>
-after using this software for a week or so, a one-box user survey pops up. It is entirely
+<div class="paragraph"><p>In order to develop <em>Subsurface</em> to serve its users in the best possible way,
+it’s important to have user information. Upon launching <em>Subsurface</em>
+and using the software for a week or so, a one-box user survey pops up. It is entirely
 optional and the user controls what, if any, data are sent to the <em>Subsurface</em> development
-team. Any data that the user chooses to send is extremely useful, and will only be
-used to steer future development and to customise the software to fit the needs of
-the <em>Subsurface</em> users. If one completes the survey, or clicks the option not to
-be asked again, that should be the last communication of this nature one receives.
-However, if one&#8217;s diving and/or subsurface habits change and one wishes to provide
-another survey, this can be done by launching <em>Subsurface</em> with the <em>--survey</em> option on the
-command line.</p></div>
+team. All data the user sends is useful, and will only be
+used to steer future development and to customize the software to fit the needs of
+the <em>Subsurface</em> users. If you complete the survey, or click the option not to
+be asked again, that should be the last communication of this type you receive.
+However, if your diving and/or subsurface habits change and you wish to fill in
+another survey, just launch <em>Subsurface</em> with the <em>--survey</em> option on the command line.</p></div>
 </div>
 </div>
 <div class="sect1">
@@ -511,7 +570,7 @@ and Linux) or the top of the screen (for Mac and Ubuntu Unity). The four panels
 <div class="olist arabic"><ol class="arabic">
 <li>
 <p>
-The <strong>Dive List</strong> to the bottom left containing a list of all the dives in the
+The <strong>Dive List</strong> on the bottom left, showing all the dives in the
 user&#8217;s
 dive log. A dive can be selected and highlighted on the dive list by clicking on
 it. In most situations the up/down keys can be used to switch
@@ -520,34 +579,32 @@ between dives. The <strong>Dive List</strong> is an important tool for manipulat
 </li>
 <li>
 <p>
-The <strong>Dive Map</strong> to the bottom right, showing the user&#8217;s dive sites on a world
-map
-and centred on the site of the last dive selected in the <strong>Dive List</strong>.
+The <strong>Dive Map</strong> on the bottom right, showing the user&#8217;s dive sites on a world map
+and centered on the site of the last dive selected in the <strong>Dive List</strong>.
 </p>
 </li>
 <li>
 <p>
-The <strong>Info</strong> to the top left, giving more detailed information on the
+The <strong>Info</strong> on the top left, giving more detailed information on the
 dive selected in the <strong>Dive List</strong>, including some statistics for the selected dive or for all
 highlighted dive(s).
 </p>
 </li>
 <li>
 <p>
-The <strong>Dive Profile</strong> to the top right, showing a graphical dive profile of the
+The <strong>Dive Profile</strong> on the top right, showing a graphical dive profile of the
 selected dive in the <strong>Dive List</strong>.
 </p>
 </li>
 </ol></div>
-<div class="paragraph"><p>The dividers between panels can be dragged in order to change the size of any of
+<div class="paragraph"><p>The dividers between panels can be dragged to change the size of any of
 the panels. <em>Subsurface</em> remembers the position of the dividers, so the next
-time <em>Subsurface</em> starts it uses the positions of the dividers from when the program
-was last used.</p></div>
+time <em>Subsurface</em> starts it uses the positions of the dividers from the last time the program was used.</p></div>
 <div class="paragraph"><p>If a single dive is selected in the <strong>Dive List</strong>, the dive location, detailed information
 and profile of
-the <em>selected dive</em> are shown in the respective panels. On the other hand, if
+the <em>selected dive</em> are shown in the respective panels. If
 several dives are selected, the last highlighted dive is the <em>selected
-dive</em>, but summary data of all <em>highlighted dives</em> are shown in the <strong>Stats</strong> tab
+dive</em>, but summary data of all <em>highlighted dives</em> is shown in the <strong>Stats</strong> tab
 of the <strong>Info</strong> panel (maximum, minimum and average depths, durations, water
 temperatures and SAC; total time and number of dives selected).</p></div>
 <div class="imageblock" id="S_ViewPanels" style="text-align:center;">
@@ -555,30 +612,29 @@ temperatures and SAC; total time and number of dives selected).</p></div>
 <img src="images/main_window_f22.jpg" alt="The Main Window" />
 </div>
 </div>
-<div class="paragraph"><p>The user can determine which of the four panels are displayed by selecting the
-<strong>View</strong> option on the main menu. This feature gives the user several choices of
-display:</p></div>
+<div class="paragraph"><p>The user decides which of the four panels are displayed by selecting the
+<strong>View</strong> option on the main menu. This feature has several choices of display:</p></div>
 <div class="paragraph"><p><strong>All</strong>: show all four of the panels as in the screenshot above.</p></div>
 <div class="paragraph"><p><strong>Divelist</strong>: Show only the Dive List.</p></div>
 <div class="paragraph"><p><strong>Profile</strong>: Show only the Dive Profile of the selected dive.</p></div>
 <div class="paragraph"><p><strong>Info</strong>: Show only the Notes about the last selected dive and statistics for
 all highlighted dives.</p></div>
-<div class="paragraph"><p><strong>Globe</strong>: Show only the world map, centred on the last selected dive.</p></div>
-<div class="paragraph"><p>Like many other functions that can be accessed via the Main Menu, these options
-can be triggered using keyboard shortcuts. The shortcuts for a particular system
+<div class="paragraph"><p><strong>Globe</strong>: Show only the world map, centered on the last selected dive.</p></div>
+<div class="paragraph"><p>Like other functions that can be accessed via the Main Menu, these options
+can also be triggered using keyboard shortcuts. The shortcuts for a particular system
 are shown with an underline in the main menu entries. Since different Operating
-Systems and the user chosen language may cause <em>Subsurface</em> to use different
-shortcut keys they are not listed here in the user manual.</p></div>
-<div class="paragraph"><p>When the program is started for the first time, it shows no information at all.
-This is because the program doesn&#8217;t have any dive information available. In the
-following sections, the procedures to create a new logbook will be described.</p></div>
+Systems and the user’s chosen language may cause <em>Subsurface</em> to use different
+shortcut keys, they are not listed in this user manual.</p></div>
+<div class="paragraph"><p>When the program is started for the first time, it shows no
+information at all, because it does not have any dive information available. In the
+following sections, the procedures to create a new logbook will be explained.</p></div>
 </div>
 </div>
 <div class="sect1">
 <h2 id="S_NewLogbook">4. Creating a new logbook</h2>
 <div class="sectionbody">
 <div class="paragraph"><p>Select <em>File &#8594;  New Logbook</em> from the main menu. All existing dive data are
-cleared so that new information can be added. If there are unsaved data in an
+cleared so new information can be added. If there are unsaved data in an
 open logbook, the user is asked whether the open logbook should be
 saved before a new logbook is created.</p></div>
 </div>
@@ -586,32 +642,25 @@ saved before a new logbook is created.</p></div>
 <div class="sect1">
 <h2 id="S_GetInformation">5. Storing dive information in the logbook</h2>
 <div class="sectionbody">
-<div class="paragraph"><p>Now that a new logbook was created, it is simple to add dive data to it.
-<em>Subsurface</em> allows several ways of adding dive data to a logbook, detailed
-in the following sections.</p></div>
-<div class="paragraph"><p>1) If the user has a handwritten divelog, a spreadsheet or another form of
+<div class="paragraph"><p>Now that a new logbook is created, it is simple to add dive data it.
+<em>Subsurface</em> allows several ways of adding dive data to a logbook.
+1) If the user has a handwritten divelog, a spreadsheet or another form of
  manually maintained divelog, dive data can be added to the logbook using
- one of these approaches:</p></div>
-<div class="ulist"><ul>
-<li>
-<p>
-Enter dive information by hand. This is useful if the diver did not
+ one of these approaches:
+ - Enter dive information by hand. This is useful if the diver didn’t
  use a dive computer and dives were recorded in a written logbook. See:
- <a href="#S_EnterData">Entering dive information by hand</a>
-</p>
-</li>
+ <a href="#S_EnterData">Entering dive information by hand</a></p></div>
+<div class="ulist"><ul>
 <li>
 <p>
 Import dive log information that has been maintained either as a spreadsheet
  or as a CSV file. Refer to: <a href="#S_Appendix_D">APPENDIX D: Exporting a spreadsheet to CSV format</a> and
  to <a href="#S_ImportingCSVDives">Importing dives in CSV format</a>.
+2) If a dive is recorded using a dive computer, the depth profile
+and a large amount of additional information can be accessed.
+These dives can be imported from:
 </p>
 </li>
-</ul></div>
-<div class="paragraph"><p>2) If one has dives recorded using a dive computer, the depth profile of the
- dive and a large amount of additional information can be accessed. These dives
- can be imported from:</p></div>
-<div class="ulist"><ul>
 <li>
 <p>
 The dive computer itself. See: <a href="#S_ImportDiveComputer">Importing new dive information from a Dive Computer</a> or
@@ -625,7 +674,7 @@ Proprietary software distributed by manufacturers of dive computers. Refer
 </li>
 <li>
 <p>
-Import from spreadsheet or CSV files containing dive profiles.
+Spreadsheet or CSV files containing dive profiles.
  See: <a href="#S_ImportingCSVDives">Importing dives in CSV format from dive computers or other dive log software</a>
 </p>
 </li>
@@ -635,10 +684,11 @@ Import from spreadsheet or CSV files containing dive profiles.
 <div class="paragraph"><p>This is usually the approach for dives without a dive computer. The basic record
 of information within <em>Subsurface</em> is a dive. The most important information
 in a simple dive logbook usually includes dive type, date, time, duration,
-depth, the names of your dive buddy and of the dive master or dive guide, and
-some remarks about the dive. <em>Subsurface</em> can store much more information
-than this for each dive. In order to add a dive to a dive log, select <em>Log
-&#8594;  Add Dive</em> from the Main Menu. The program then shows three panels to enter
+depth, the names of your dive buddy and the dive master or dive guide, and
+some remarks about the dive. <em>Subsurface</em> can store much more
+information for each dive.  To add a dive to a dive log, select <em>Log
+&#8594;  Add Dive</em> from the Main Menu. The program then shows three panels
+on which to enter
 information for a dive: two tabs in the <strong>Info</strong> panel (<strong>Notes</strong> and
 <strong>Equipment</strong>), as well as the <strong>Dive Profile</strong> panel that displays a graphical profile
 of each dive. These panels are respectively marked <span class="red">A</span>, <span class="red">B</span> and
@@ -649,7 +699,7 @@ in the figure below. Each of these tabs will now be explained for data entry.</p
 <img src="images/AddDive1_f22.jpg" alt="FIGURE: Add dive" />
 </div>
 </div>
-<div class="paragraph"><p>When one edits a field in Notes or Equipment panels, <em>Subsurface</em> enters <strong>Editing Mode</strong>,
+<div class="paragraph"><p>When you edit a field in Notes or Equipment panels, <em>Subsurface</em> enters <strong>Editing Mode</strong>,
 indicated by the message in the blue box at the top of the <strong>Notes</strong> panel (see the image below). This message is
 displayed in all the panels under Notes and Equipment when in <strong>Editing Mode</strong>.</p></div>
 <div class="imageblock" style="text-align:center;">
@@ -660,32 +710,33 @@ displayed in all the panels under Notes and Equipment when in <strong>Editing Mo
 <div class="paragraph"><p>The <em>Apply changes</em> button should only be selected after all the parts of a dive have been entered.
 When entering dives by hand, the <em>Info</em>, <em>Equipment</em> and <em>Profile</em> tabs should be completed
 before saving the information. By selecting the <em>Apply changes</em> button, a local copy of the information
-for this specific dive is saved in memory. When one closes Subsurface, the program will
+for this specific dive is saved in memory. The <em>Apply changes</em> button should ONLY be selected after all parts
+of a dive have been entered. When you close Subsurface, the program will
 ask again, this time whether the complete dive log should be saved on disk or not.</p></div>
 <div class="sect3">
 <h4 id="S_CreateProfile">5.1.1. Creating a Dive Profile</h4>
 <div class="paragraph"><p>The <strong>Dive Profile</strong> (a graphical representation of the depth of the dive as a
-function of time) is indicated in the panel on the top right hand of the
+function of time) is shown in the panel on the top right hand of the
 <em>Subsurface</em> window. When a dive is manually added to a logbook, <em>Subsurface</em>
 presents a default dive profile that needs to be modified to best represent the
-dive being described:</p></div>
+dive described:</p></div>
 <div class="imageblock" style="text-align:center;">
 <div class="content">
 <img src="images/DiveProfile1_f20.jpg" alt="FIGURE: Initial dive profile" />
 </div>
 </div>
 <div class="paragraph"><p><em>Modifying the dive profile</em>: When the cursor is moved around the dive profile,
-its position is indicated by two right-angled red lines as shown below.
+its position is shown by two right-angled red lines as seen below.
 The time and depth
 represented by the cursor are indicated at the top of the black information box
 (@ and D). The units (metric/imperial) on the axes are determined by the
 <strong>Preference</strong> settings. The dive profile itself comprises several
 line segments demarcated by waypoints (white dots on the profile, as shown
 above). The default dive depth is 15 m.
-If the dive depth was 20 m then the user needs to drag the appropriate waypoints
-downwards to represent 20 m. To add a waypoint, double-click on
+If the dive depth was 20 m then you need to drag the appropriate waypoints
+downward to 20 m. To add a waypoint, double-click on
 any line segment. To move an additional waypoint, drag it.
-To remove this waypoint, right-click on it and choose "Remove this point" from the
+To remove a waypoint, right-click on it and choose "Remove this point" from the
 context menu. Drag the waypoints to represent an
 accurate
 time duration for the dive. Below is a dive profile for a dive
@@ -695,11 +746,11 @@ to 20 m for 30 min, followed by a 5 minute safety stop at 5 m.</p></div>
 <img src="images/DiveProfile2_f20.jpg" alt="FIGURE: Edited dive profile" />
 </div>
 </div>
-<div class="paragraph"><p><em>Specifying the gas composition:</em> The gas composition used is clearly indicated
+<div class="paragraph"><p><em>Specifying the gas composition:</em> The gas composition used is indicated
 along the line segments of the dive profile. This defaults to the first gas
 mixture specified in the <strong>Equipment</strong> tab, which was air in the case of the
 profile above. The gas mixtures of segments of the dive profile can
-be edited. This is done by right-clicking on the particular
+be changed by right-clicking on the particular
 waypoint and selecting the appropriate gas from the context menu. Changing
 the gas for a waypoint affects the gas shown in the segment <em>to the left</em> of
 that
@@ -710,11 +761,11 @@ context menu (see image below).</p></div>
 <img src="images/DiveProfile3_f20.jpg" alt="FIGURE: Gas composition context menu" />
 </div>
 </div>
-<div class="paragraph"><p>With the profile having been defined, more details must be added in order to have
+<div class="paragraph"><p>With the profile now defined, more details must be added to have
 a fuller record of the dive. To do this,
 the <strong>Notes</strong> and the <strong>Equipment</strong> tabs on the top left hand of the
 <em>Subsurface</em> window should be used. Click on
-<a href="#S_Notes_dc"><strong>this link</strong></a> for instructions to use these tabs.</p></div>
+<a href="#S_Notes_dc"><strong>this link</strong></a> for instructions on how to use these tabs.</p></div>
 </div>
 </div>
 <div class="sect2">
@@ -724,9 +775,8 @@ the <strong>Notes</strong> and the <strong>Equipment</strong> tabs on the top le
 <div class="paragraph"><p>The use of dive computers allows the collection of a large amount of
 information about
 each dive, e.g. a detailed record of depth, duration, rates of ascent/descent
-and of gas partial pressures. <em>Subsurface</em> can capture this information and
-present it as part of the dive information, using dive
-information from a wide range of dive computers. The latest list of supported
+and of gas partial pressures. <em>Subsurface</em> can capture this information,
+using dive details from a wide range of dive computers. The latest list of supported
 dive computers can be found at:
 <a href="http://subsurface-divelog.org/documentation/supported-dive-computers/">
 Supported dive computers</a>.</p></div>
@@ -735,10 +785,9 @@ Supported dive computers</a>.</p></div>
 <td class="icon">
 <img src="images/icons/warning2.png" alt="Warning" />
 </td>
-<td class="content">Several dive computers consume more power when they are in their
+<td class="content">Several dive computers consume more power when they are in
 PC-Communication mode. <strong>This could drain the dive computer&#8217;s battery</strong>. We
-therefore
-recommend that the user checks if the dive computer is charged when
+recommend the user checks to be sure 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
@@ -748,21 +797,20 @@ while connected to the USB port.</td>
 </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.
+the two pieces of equipment must communicate with one another.
 This
 involves setting up the communications port (or mount point) of the computer
-with <em>Subsurface</em> that communicates with the dive computer. In order to set up
-this communication, one needs to find the appropriate information to
+with <em>Subsurface</em> that communicates with the dive computer. To set up
+this communication, users need to find the appropriate information to
 instruct
 <em>Subsurface</em> where and how to import the dive information.
 <a href="#_appendix_a_operating_system_specific_information_for_importing_dive_information_from_a_dive_computer">Appendix A</a>
-provides the technical information to help the user achieving this for different
+provides the technical information to help the user achieve 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="paragraph"><p>After this, the dive computer can be hooked up to the user&#8217;s PC using these steps:</p></div>
 <div class="olist arabic"><ol class="arabic">
 <li>
 <p>
@@ -789,7 +837,7 @@ In <em>Subsurface</em>, from the Main Menu, select <em>Import &#8594;  Import
 <img src="images/DC_import_f20.jpg" alt="FIGURE: Download dialogue 1" />
 </div>
 </div>
-<div class="paragraph"><p>Dive computers tend to keep a certain number of dives in their memory, even
+<div class="paragraph"><p>Dive computers tend to keep a certain number of dives in memory, even
 though these dives have already been imported to <em>Subsurface</em>. For that reason, if
 the dive computer allows this,
 <em>Subsurface</em> only imports dives that have not been uploaded before. This makes
@@ -815,7 +863,7 @@ The <strong>Device or Mount Point</strong> drop-down list contains the USB or Bl
    and
    <a href="#_appendix_b_dive_computer_specific_information_for_importing_dive_information">Appendix B</a>
    for technical details on how to find the appropriate port information for a
-   particular dive
+   specific dive
    computer and, in some cases, how to do the correct settings to the operating
    system of the computer on which <em>Subsurface</em> is running.
 </p>
@@ -825,9 +873,9 @@ The <strong>Device or Mount Point</strong> drop-down list contains the USB or Bl
 If all the dives on the dive computer need to be downloaded, check the
    checkbox <em>Force download of all dives</em>. Normally, <em>Subsurface</em> only downloads
    dives after the date-time of the last dive in the <strong>Dive List</strong> panel. If one
-   or more of your dives in <em>Subsurface</em> have been accidentally deleted or if there
+   or more of your dives in <em>Subsurface</em> has 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
+   box needs to be checked. 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.
@@ -839,7 +887,7 @@ If the checkbox <em>Always prefer downloaded dives</em>
    has been checked and, during download, dives with identical date-times exist on
    the dive computer and on the <em>Subsurface</em>
    <strong>Dive List</strong> panel, the dive in the <em>Subsurface</em> divelog will be overwritten
-   by the dive record from the dive computer.
+   by the dive record from the computer.
 </p>
 </li>
 <li>
@@ -852,20 +900,20 @@ The checkbox marked <em>Download into new trip</em> ensures that, after upload,
 <p>
 Do <strong>not</strong> check the checkboxes labelled <em>Save libdivecomputer logfile</em> and
    <em>Save libdivecomputer dumpfile</em>. These are only used as diagnostic tools
-   when problems with downloads are experienced (see below).
+   when there are problems with downloads(see below).
 </p>
 </li>
 <li>
 <p>
 Then select the <em>Download</em> button.
-   With communication established, one can see how the data are
+   With communication established, you can see how the data are
    retrieved from the dive computer.
    Depending on the make of the dive computer and/or number of recorded dives, this
    could take some time. Be patient. The <em>Download</em> dialogue
    shows a
-   progress bar at the bottom of the dialogue (for some dive computers the
-   progress information could be inaccurate as we cannot determine how much
-   downloadable data there is until all data have been downloaded). After successful download, Dialogue <strong>B</strong>
+   progress bar at the bottom of the dialogue.  Remember for some dive computers
+   progress information could be inaccurate since the program doesn’t know how much
+   downloadable data there is until the download is complete. After successful download, Dialogue <strong>B</strong>
    in the figure above appears.
    After the dives have been downloaded, they appear in a tabular format on the right-hand
    side of the dialogue (see image <strong>B</strong>, above). Each dive comprises a row in the table, with the date, duration
@@ -879,7 +927,7 @@ Then select the <em>Download</em> button.
 </p>
 </li>
 </ul></div>
-<div class="paragraph"><p>After this has been completed, select the OK button.
+<div class="paragraph"><p>Then click the OK button.
 The checked dives are transferred to the <strong>Dive List</strong>.</p></div>
 <div class="ulist"><ul>
 <li>
@@ -910,13 +958,12 @@ Is the dive computer still in PC-communication or
 </li>
 <li>
 <p>
-Is the battery of the dive computer fully charged? If not then the battery
-   must be charged or replaced.
+Is the dive computer’s battery fully charged? If not then charge or replace it.
 </p>
 </li>
 <li>
 <p>
-Is the connecting cable faulty? Does the cable work perfectly using other
+Is the connecting cable faulty? Does the cable work using other
    software? Has it worked before, or is this the first time the cable is being used? Are the contacts
    on the dive computer and the cable clean?
 </p>
@@ -925,7 +972,7 @@ Is the connecting cable faulty? Does the cable work perfectly using other
 <p>
 Consult
    <a href="#_appendix_a_operating_system_specific_information_for_importing_dive_information_from_a_dive_computer">Appendix A</a>
-   and make sure that the correct Mount Point
+   to be sure the correct Mount Point
    was specified (see above).
 </p>
 </li>
@@ -937,22 +984,22 @@ On Unix-like operating systems, does the user have write permission to the
 </p>
 </li>
 </ul></div>
-<div class="paragraph"><p>If the <em>Subsurface</em> computer does not recognise the USB adaptor by
+<div class="paragraph"><p>If the <em>Subsurface</em> computer does not recognize the USB adaptor by
 showing an appropriate device name next to the Mount Point, then there is a
-possibility that the cable or USB adaptor is faulty. A faulty cable is the most
-common cause of communication failure between dive computer and <em>Subsurface</em>
-computer. It is also possible that the <em>Subsurface</em> computer cannot interpret
+possibility the cable or USB adaptor is faulty. A faulty cable is the most
+common cause of communication failure between a dive computer and <em>Subsurface</em>
+computer. It’s also possible the <em>Subsurface</em> computer cannot interpret
 the data. Perform a download for diagnostic purposes with the following
-two check boxes checked in the download dialogue discussed above:</p></div>
+two boxes checked in the download dialogue discussed above:</p></div>
 <div class="literalblock">
 <div class="content">
 <pre><code>Save libdivecomputer logfile
 Save libdivecomputer dumpfile</code></pre>
 </div></div>
 <div class="paragraph"><p><strong>Important</strong>: These check boxes are only used when problems are encountered
-during the download process: under normal circumstances they should not be checked.
-When checking these boxes, the user is prompted to select a folder to
-save the information to. The default folder is the one in which the <em>Subsurface</em>
+during the download process. Under normal circumstances they should not be checked.
+When checking these boxes, the user is prompted to select a folder where the information will be saved. The default folder is the one in which the
+<em>Subsurface</em>
 dive log is kept.</p></div>
 <div class="paragraph"><p><strong>Important:</strong> <em>After downloading with the above checkboxes
 checked, no dives are added to the
@@ -964,7 +1011,7 @@ 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
+request for the files to be analyzed. Provide the dive computer
 make and model
 as well as contextual information about the dives recorded on the dive computer.</p></div>
 </div></div>
@@ -972,66 +1019,70 @@ as well as contextual information about the dives recorded on the dive computer.
 <div class="sect3">
 <h4 id="S_Bluetooth">5.2.2. Connecting <em>Subsurface</em> to a Bluetooth-enabled dive computer</h4>
 <div class="paragraph"><p>Bluetooth is becoming a more common way of communication between dive computers
-and <em>Subsurface</em>, for instance, the Shearwater Petrel
+and <em>Subsurface</em>, for or instance, the Shearwater Petrel
 Mk2 and the OSTC Mk3. <em>Subsurface</em> provides a largely operating system independent
 Bluetooth interface. Setting up <em>Subsurface</em> for Bluetooth communication requires
 four steps:</p></div>
 <div class="ulist"><ul>
 <li>
 <p>
-Ensure that Bluetooth is activated on the host computer running <em>Subsurface</em>.
+Be sure Bluetooth is activated on the host computer running <em>Subsurface</em>.
 </p>
 </li>
 <li>
 <p>
-Ensure that <em>Subsurface</em> sees the Bluetooth adapter on the host computer.
+Be sure <em>Subsurface</em> sees the Bluetooth adapter on the host computer.
 </p>
 </li>
 <li>
 <p>
-Ensure the Bluetooth-enabled dive computer is Bluetooth-discoverable and in PC upload mode.
+Be sure the Bluetooth-enabled dive computer is Bluetooth-discoverable and in PC upload mode.
 </p>
 </li>
 <li>
 <p>
-Ensure that <em>Subsurface</em> is paired with the Bluetooth-enabled dive computer.
+Be sure <em>Subsurface</em> is paired with the Bluetooth-enabled dive computer.
 </p>
 </li>
 </ul></div>
 <div class="paragraph"><p>Select the Download dialogue by selecting
-<em>Import &#8594; Import from dive computer</em> from the <strong>Main Menu</strong>. If one checks the
-check box labelled <em>"Choose Bluetooth download mode"</em>, the dialogue below appears.</p></div>
-<div class="sect4">
-<h5 id="_on_linux_or_macos">On Linux or MacOS:</h5>
+<em>Import &#8594; Import from dive computer</em> from the <strong>Main Menu</strong>. If you check the
+box labelled <em>"Choose Bluetooth download mode"</em>, the dialogue below appears.
+===== On Linux or MacOS:</p></div>
 <div class="imageblock" style="text-align:center;">
 <div class="content">
 <img src="images/DC_import_Bluetooth.jpg" alt="FIGURE: Download Bluetooth" />
 </div>
 </div>
 <div class="paragraph"><p>On the <em>Linux</em> or <em>MacOS</em> platforms the name
-of the <em>Subsurface</em> computer and its Bluetooth address are shown on the right-hand side, On the lefthand side, if the
+of the <em>Subsurface</em> computer and its Bluetooth address are shown on the right hand side,
+On the left hand side, if the
 computer has connected more than one local Bluetooth devices the user can use
 the list box to indicate which one needs to connect to <em>Subsurface</em>.
 The power state (on/off) of the Bluetooth adapter is shown below
-the address and can be changed by checking the <em>Turn on/off</em> check box.</p></div>
-<div class="paragraph"><p>If the Bluetooth address is not shown, then <em>Subsurface</em> does not see the local
-Bluetooth device. Ensure that the Bluetooth driver is installed correctly on the
+the address and can be changed by checking the <em>Turn on/off</em> box.
+If the Bluetooth address is not shown, then <em>Subsurface</em> does not see the local
+Bluetooth device. Be sure the Bluetooth driver is installed correctly on the
 <em>Subsurface</em> computer and check if it can be used by other Bluetooth utilities like
-<em>bluetoothctl</em> or <em>bluemoon</em>. This achieves the first two steps above.</p></div>
-<div class="paragraph"><p>Ensure that the Bluetooth-enabled dive computer is in PC-upload mode and that it
+<em>bluetoothctl</em> or <em>bluemoon</em>. This finishes the first two steps above.
+Be sure the Bluetooth-enabled dive computer is in PC-upload mode and it
 is discoverable by other Bluetooth devices. Consult the manual of the dive
-computer to perform this. Now the third item in the list above has been achieved.</p></div>
-<div class="paragraph"><p>Select the <em>Scan</em> button towards the bottom left of the dialogue above. After
-searching for a small amount of time, the dive computer should be listed
+computer for more information. Now the third item in the list above has been finished.
+Select the <em>Scan</em> button towards the bottom left of the dialogue above. After
+searching, the dive computer should be listed
 (perhaps as one of a number of Bluetooth devices) in the main list box on the
-lefthand side of the dialogue (see image above). If this is not achieved, select
-the <em>Clear</em> button and then scan again for Bluetooth devices using the <em>Scan</em>
-button. After performing these actions <em>Subsurface</em> should see the dive computer.
+lefthand side of the dialogue (see image above). If this does not work, select
+the <em>Clear</em> button, then scan again for Bluetooth devices using the <em>Scan</em>
+button. After taking these actions <em>Subsurface</em> should see the dive computer.
 The label of the discovered dive computer contains the name of the device, its
 address and its pairing status. If the device is not paired and has a red
-background colour, a context menu can be opened by selecting the item with a
+background color, 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>
+Select the the <em>Pair</em> option and wait for the task to complete. If this dive computer
+is being paired to Subsurface for the first time, it’s possible Subsurface will
+request a Pass Code or PIN number. The most commonly-used Pass Code is 0000,
+and this works for the Shearwater Petrel. If necessary, consult the user manual of the
+dive computer being used.</p></div>
 <div class="sidebarblock">
 <div class="content">
 <div class="admonitionblock">
@@ -1059,11 +1110,10 @@ Request PIN code
 [agent] Enter PIN code: 0000</code></pre>
 </div></div>
 </div></div>
-<div class="paragraph"><p>After the devices are paired the <em>Save</em> button of the dialogue can be pressed.
+<div class="paragraph"><p>After the devices are paired, press the <em>Save</em> button of the dialogue.
 This closes the Bluetooth dialogue. Now select <em>Download</em> in the <em>Download from
 dive computer</em> dialogue which should still be open. The downloaded dives are
 shown on the righthand side of the download dialogue.</p></div>
-</div>
 <div class="sect4">
 <h5 id="_on_windows">On Windows:</h5>
 <div class="imageblock" style="text-align:center;">
@@ -1071,12 +1121,17 @@ shown on the righthand side of the download dialogue.</p></div>
 <img src="images/DC_import_Bluetooth_Windows.png" alt="FIGURE: Download Bluetooth on Windows" />
 </div>
 </div>
-<div class="paragraph"><p>On <em>Windows</em> platforms the <em>Local Bluetooth device details section</em> on the right is not displayed.
-To successfully initiate a scan (by pressing the <em>Scan</em> button)
-check that the Bluetooth device on the <em>Subsurface</em> computer is turned on.</p></div>
+<div class="paragraph"><p>On <em>Windows</em> platforms the <em>Local Bluetooth device details section</em> on the right is not displayed as
+is the case on the Linux/Mac systems.
+To start a scan (by pressing the <em>Scan</em> button)
+check that the Bluetooth device on the <em>Subsurface</em> computer is turned on by selecting
+the dive computer from the list of available Bluetooth devices (see image above). If the dive computer
+is being accessed by Subsurface for the first time, it’s possible Subsurface will
+request a Pass Code or PIN number. Supply the Pass Code recommended in the user manual of the dive computer.
+A Pass Code or PIN of 0000 is often the default.</p></div>
 <div class="paragraph"><p>The pairing step is checked and done automatically during
 the download process. If the devices have never been paired the system will ask
-for your permissions and put a message on the right side of the screen: <em>Add a
+for your permission and put a message on the right side of the screen: <em>Add a
 device, Tap to set up your DC device</em>. Always allow this pairing. After a
 discovered item is selected, select the <em>Save</em> button.
 Finally select the <em>Download</em> button on the <em>Download</em> dialogue and wait for the process to complete.</p></div>
@@ -1085,13 +1140,14 @@ Finally select the <em>Download</em> button on the <em>Download</em> dialogue an
 <td class="icon">
 <img src="images/icons/important.png" alt="Important" />
 </td>
-<td class="content">Be aware that currently <em>Subsurface</em> works only with local Bluetooth
+<td class="content">Currently <em>Subsurface</em> works only with local Bluetooth
 adapters which use Microsoft Bluetooth Stack. If the local device uses
-<em>Widcomm</em>,  <em>Stonestreet One Bluetopia Bluetooth</em> or <em>BlueSolei</em> drivers it
-will definitely not work.</td>
+<em>Widcomm</em>,  <em>Stonestreet One Bluetopia Bluetooth</em> or <em>BlueSoleil</em> drivers it
+will not work. However, Bluetooth hardware/dongles from these manufacturers
+(e.g. iSonic) that support the Microsoft Bluetooth Stack do work.</td>
 </tr></table>
 </div>
-<div class="paragraph"><p>A log messageOn the bottom left of the <em>Remote Bluetooth device selection</em>
+<div class="paragraph"><p>A log message on the bottom left of the <em>Remote Bluetooth device selection</em>
 shows details about the current status of the Bluetooth agent. To
 select another dive computer for download using the "Remote Bluetooth selection dialogue"
 press the three-dots button from the <em>"Choose Bluetooth download mode"</em> option.</p></div>
@@ -1113,15 +1169,15 @@ with <em>Subsurface</em>.</td>
 <div class="sect3">
 <h4 id="S_DeviceNames">5.2.3. Changing the name of a dive computer</h4>
 <div class="paragraph"><p>It may be necessary to distinguish between different dive computers used to
-upload dive logs to <em>Subsurface</em>. For instance if one&#8217;s partner&#8217;s dive computer is the
-same make and model as one&#8217;s own and dive logs are uploaded from both dive computers
+upload dive logs to <em>Subsurface</em>. For instance if a buddy’s dive computer is the
+same make and model as your own and dive logs are uploaded from both dive computers
 to the same <em>Subsurface</em> computer, then
-one would perhaps like to call one dc "Alice&#8217;s Suunto D4" and the other one
-"Bob&#8217;s Suunto D4". Alternatively, consider a technical diver dives with two or more
+you might like to call one "Alice&#8217;s Suunto D4" and the other
+"Bob&#8217;s Suunto D4". Alternatively, consider a technical diver who dives with two or more
 dive computers of the same model, the logs of both (or all) being uploaded.
 In this case it might be prudent to call one of them
-"Suunto D4 (1)" and another one "Suunto D4 (2)". This is easily done in <em>Subsurface</em>.
-On the <strong>Main Menu</strong>, select <em>Log &#8594;  Edit device names</em>. A dialog opens, indicating the
+"Suunto D4 (1)" and another "Suunto D4 (2)". This is easily done in <em>Subsurface</em>.
+On the <strong>Main Menu</strong>, select <em>Log &#8594;  Edit device names</em>. A dialog box opens, showing the
 current Model, ID and Nickname of the dive computers used for upload. Edit the Nickname
 field for the appropriate dive computer. After saving the Nickname, the dive logs
 show the nickname for that particular device instead of the model name,
@@ -1130,23 +1186,23 @@ allowing easy identification of devices.</p></div>
 <div class="sect3">
 <h4 id="S_EditDiveInfo">5.2.4. Updating the dive information imported from the dive computer.</h4>
 <div class="paragraph"><p>With the uploaded dives in the <strong>Dive List</strong>, the information from the dive
-computer is not complete and more details must be added in order to have
-a fuller record of the dives. To do this,
+computer is not complete and more details must be added to have
+a full record of the dives. To do this,
 the <strong>Notes</strong> and the <strong>Equipment</strong> tabs on the top left hand of the
 <em>Subsurface</em> window should be used.</p></div>
 <div class="sect4">
 <h5 id="S_Notes_dc">Notes</h5>
-<div class="paragraph"><p>To have a more complete dive record the user needs to add
+<div class="paragraph"><p>To have a more complete dive record, the user needs to add
 additional information by hand. The procedure
 below is virtually identical for hand-entered dives and for dives downloaded from a dive computer.</p></div>
 <div class="paragraph"><p>In some cases,
-one has to provide the date and time of the dive, e.g. when entering a dive by hand or when a
-dive computer does not provide the date and time of the dive.
+you must provide the date and time of the dive, for example when entering a dive by hand or when a
+dive computer doesn’t provide the date and time of the dive.
 (Usually the date and time of the dive, gas mixture and water temperature are
 shown as obtained from the dive computer)
 If the contents of the <strong>Notes tab</strong> is changed or edited in any way, the message in a blue box at
-the top of the panel indicates that the dive is being edited. If one
-clicks on the <strong>Notes</strong> tab, the following fields are
+the top of the panel shows the dive is being edited. If you
+click on the <strong>Notes</strong> tab, the following fields are
 visible (left hand image, below):</p></div>
 <div class="imageblock" style="text-align:center;">
 <div class="content">
@@ -1156,16 +1212,15 @@ visible (left hand image, below):</p></div>
 <div class="paragraph"><p>The right hand image, above, shows a <strong>Notes tab</strong> filled with dive information.
 The <strong>Time</strong> field reflects the date and time of the dive. By clicking
 the date, a calendar is displayed from which
-one can choose the correct date. Press ESC to close the calendar.
+you can choose the correct date. Press ESC to close the calendar.
 The time values (hour and minutes) can also be
 edited directly by clicking on each of them in the text box and by over-typing the
 information displayed.</p></div>
 <div class="paragraph"><p><strong>Air/water temperatures</strong>: Air and water temperatures during the dive are shown
 in text boxes to the right of the Start time. Many dive computers supply water
-temperature information and this box may therefore contain information.
-If air temperature is not provided by the dive computer, the first temperature reading
-might be used for the air temperature. Generally this is close enough to the real air temperature as
-the change in the temperature sensor reading is quite slow to follow the changes in the environment.
+temperature information and this box may have information.
+If air temperature isn’t provided by the dive computer, the first temperature reading
+might be used for the air temperature. Generally this is close to the real air temperature.
 If editing is required, only a value is required, the units of temperature will be
 automatically supplied by
 <em>Subsurface</em> (following the <em>Preferences</em>, metric or imperial units will
@@ -1177,29 +1232,29 @@ be used).</p></div>
 <img src="images/icons/warning2.png" alt="Warning" />
 </td>
 <td class="content">Dive locations are managed as a <strong>separate</strong> part of the dive log.
-The dive information in the <strong>Notes</strong> and <strong>Equipment</strong> tabs can therefore not be edited at the same
+The dive information in the <strong>Notes</strong> and <strong>Equipment</strong> tabs can therefore NOT be edited at the same
 time as the dive site information. Save all the other dive information (e.g.
 divemaster, buddy, protective gear, notes about the dive) by selecting <em>Apply changes</em> on the
-<strong>Notes</strong> tab before editing the dive site information. Only then, supply a dive site name in the
+<strong>Notes</strong> tab BEFORE editing the dive site information. Then supply a dive site name in the
 textbox labelled <em>Location</em> on the <strong>Notes</strong> tab.</td>
 </tr></table>
 </div>
-<div class="paragraph"><p>Type the name of the dive site, e.g. "Tihany, Lake Balaton, Hungary".
+<div class="paragraph"><p>Type in the name of the dive site, e.g. "Tihany, Lake Balaton, Hungary".
 If several dives are
-performed at the same location, the dive site information for the first dive is re-used.
-Existing dive location information
-can be edited at any time by selecting (on the <strong>Dive List</strong> panel) a dive performed at that site
-and by opening the location information by clicking the globe button on the
+made at the same location, the site information for the first dive is re-used.
+Existing dive locations
+can be edited by selecting (on the <strong>Dive List</strong> panel) a dive done at that site
+and by opening the location information. Click the globe button on the
 right of the location name (see image on the right, above). When entering a dive location name, auto location of
-dive site names makes it easy to select an existing dive site name
-(i.e. when typing the name of a dive site,
-a dropdown list appears showing all sites with similar names). If the dive
+dive site names makes it easy to select an existing dive site name.
+When typing the name of a dive site,
+a dropdown list appears showing all sites with similar names. If the dive
 site has been used before, click on the already-existing name.
 The dive site names in the dropdown list contain either a globe symbol (indicating
 existing dive sites in the <em>Subsurface</em> database)
 or a <strong>+</strong> symbol (indicating dive site names that appear consistent with the
-current dive site name but which have not been added to the dive site database).
-Therefore, if the present
+current dive site name but which haven’t been added to the dive site database).
+If the present
 dive site has not been used before, a message appears as follows (image <strong>A</strong> below):</p></div>
 <div class="imageblock" style="text-align:center;">
 <div class="content">
@@ -1207,30 +1262,29 @@ dive site has not been used before, a message appears as follows (image <strong>
 </div>
 </div>
 <div class="paragraph"><p>Doubleclick on the new dive site name. A panel appears to enter the coordinates and
-other important information about the site (image <strong>B</strong>, above). The most important
-items are the coordinates of the site. There are three ways of specifying the coordinates:</p></div>
+other information about the site (image <strong>B</strong>, above). The most important
+items are the coordinates of the site. There are three ways to specify coordinates:</p></div>
 <div class="olist loweralpha"><ol class="loweralpha">
 <li>
 <p>
-One can find the coordinates on the world map in the bottom right hand
-   part
+Use the world map in the bottom right hand part
    of the <em>Subsurface</em> window. The map displays an orange bar indicating "No location
-   data - Move the map and double-click to set the dive location". Upon a doubleclick
-   at the appropriate place, the orange bar disappears and the coordinates are
+   data - Move the map and double-click to set the dive location". Doubleclick
+   at the appropriate place, and the orange bar disappears and the coordinates are
    stored.
 </p>
 </li>
 <li>
 <p>
-The coordinates can be obtained from the <em>Subsurface</em> Companion app if the
-   user has an Android or iPhone device with GPS and if the coordinates of the dive site
-   were stored using that device.
+Use the <em>Subsurface</em> Companion app if you
+   have an Android or iPhone device with GPS and if the dive site coordinates
+   were stored using it.
    <a href="#S_Companion">Click here for more information</a>
 </p>
 </li>
 <li>
 <p>
-The coordinates can be entered by hand if they are known, using one of
+Enter by hand if the coordinates are known, using one of
    four formats with latitude followed by longitude:
 </p>
 <div class="literalblock">
@@ -1246,75 +1300,74 @@ Decimal degrees, e.g. 30.22496 , 30.821798</code></pre>
 negative value, e.g. -30.22496. Similarly western longitudes are given with a
 <strong>W</strong>, e.g. W07°, or with a negative value, e.g. -7.34323. Some keyboards
 don&#8217;t have the degree sign (°). It can be replaced by a <strong>d</strong> like this: N30d W20d.
-If both a dive site name and coordinates have been provided, Save the
+If both a dive site name and coordinates have been provided, save the
 dive site information by selecting the button <em>Apply changes</em> at the top of
 the panel.</p></div>
-<div class="paragraph"><p><strong>Important</strong>: GPS coordinates of a dive site are linked to the Location
-name - so <strong>saving</strong> a dive site with only coordinates and no dive site name
-causes unexpected behaviour (Subsurface will think that all of these
+<div class="paragraph"><p><strong>Important</strong>: GPS coordinates of a dive site are linked to the location
+name - so <strong>saving</strong> a dive site with only coordinates and no name
+causes problems. (Subsurface will think all of these
 dives have the same location and try to keep their GPS coordinates the
 same).</p></div>
 <div class="paragraph"><p><strong>Dive site name lookup:</strong> If coordinates have been typed into the appropriate
-text box, one can perform an automated name lookup based on the coordinates.
-This is achieved when <em>Subsurface</em> uses the Internet to find the name of the dive site
+text box, you can do an automated name lookup based on the coordinates.
+This is done when <em>Subsurface</em> uses the Internet to find the name of the dive site
 based on the coordinates that were typed. If a name has been found, it is
 automatically inserted into the tags box. The list box
 (Titled <em>Dive sites on same coordinates</em>") at the bottom
 of the dive site panel contains the names of other dives sites used at the
 current location. For instance if the dive site is "Blue Hole" and there are several
-dive sites named "Blue Hole", all these sites are listed in this list box.</p></div>
-<div class="paragraph"><p>Enter any other textual information about the dive site (Description and Notes),
-then select <em>Apply Changes</em> to save the geolocation for this dive site. At a later stage
-the dive site information can be edited by clicking the globe icon to the right of the
+sites named "Blue Hole", all of them are listed.</p></div>
+<div class="paragraph"><p>Enter any other contextual information about the dive site (Description and Notes),
+then select <em>Apply Changes</em> to save the geolocation for this dive site.
+The dive site information can later be edited by clicking the globe icon to the right of the
 dive site name in the <strong>Notes tab</strong>.</p></div>
-<div class="paragraph"><p><strong>Dive mode</strong>: This is a dropdown box allowing one to choose the type of dive
-performed. The options are OC (Open Circuit SCUBA, the default seting, meant for most recreational dives),
+<div class="paragraph"><p><strong>Dive mode</strong>: This is a dropdown box allowing you to choose the type of dive
+performed. The options are OC (Open Circuit SCUBA, the default setting, for most recreational dives),
 Freedive (dive without SCUBA equipment), CCR (Closed-circuit
 rebreather) and pSCR (Passive semi-closed rebreather).</p></div>
-<div class="paragraph"><p><strong>Divemaster</strong>: The name of the dive master or dive guide for this dive should be
+<div class="paragraph"><p><strong>Divemaster</strong>: The name of the divemaster or dive guide should be
 entered in this field
 which offers auto selection based on the list of dive masters in
 the current logbook.</p></div>
-<div class="paragraph"><p><strong>Buddy</strong>: In this field, one enters the name(s) of the buddy / buddies
-(separated with commas) who accompanied him/her on the
+<div class="paragraph"><p><strong>Buddy</strong>: In this field, enter the name(s) of the buddy or buddies
+(separated with commas) who were on the
 dive. Auto selection based on the list of buddies in the current logbook is
 offered.</p></div>
 <div class="paragraph"><p><strong>Suit</strong>: Here the type of dive suit used can be entered.
 Auto selection of the suit description is available.
 Some dry-suit users may choose to use this field to record what combination of
-suit and thermal undersuit was used.</p></div>
-<div class="paragraph"><p><strong>Rating</strong>: One can provide a subjective overall rating of the dive on a
+suit and thermal under suit was used.</p></div>
+<div class="paragraph"><p><strong>Rating</strong>: You can provide a subjective overall rating of the dive on a
 5-point scale by clicking the appropriate star on the rating scale.</p></div>
-<div class="paragraph"><p><strong>Visibility</strong>: Similarly, one can provide a rating of visibility during the
+<div class="paragraph"><p><strong>Visibility</strong>: You can provide a rating of visibility during the
 dive on a
 5-point scale by clicking the appropriate star.</p></div>
-<div class="paragraph"><p><strong>Tags</strong>: Tags that describe the type of dive performed can be entered
+<div class="paragraph"><p><strong>Tags</strong>: Tags that describe the type of dive done can be entered
 here (separated by commas). Examples of common tags are boat, drift, training,
 cave, etc.
-<em>Subsurface</em> has many built-in tags. If the user starts typing a tag, the
+<em>Subsurface</em> has many built-in tags. If you starts typing a tag, the
 program
-will list the tags that correspond to the typing. For instance, if the user
-typed
-<code>cav</code>, then the tags <strong>cave</strong> and <strong>cavern</strong> are shown for the user to choose from.</p></div>
+will list the tags that correspond to the typing. For instance, by typing
+<code>cav</code>, the tags <strong>cave</strong> and <strong>cavern</strong> are shown to choose from.</p></div>
 <div class="paragraph"><p><strong>Notes</strong>: Any additional information for the dive can be entered here.</p></div>
 <div class="paragraph"><p>The <em>Apply changes</em> and <em>Discard changes</em> buttons are used to save all the information for tabs
-in the <strong>Info</strong> panel and in the <strong>Dive Profile</strong> panel, so there&#8217;s no need to use them
-until <strong>ALL</strong> other information has been added. The image <a href="#S_Notes_dc">at the beginning of this section</a>
-shows an example of a <strong>Notes tab</strong> after completion of the dive information.</p></div>
+in the <strong>Info</strong> panel and in the <strong>Dive Profile</strong> panel. Use them
+when <strong>ALL</strong> other information has been added. The image <a href="#S_Notes_dc">at the beginning of this section</a>
+shows an example of a <strong>Notes tab</strong> after completing the dive information.</p></div>
 </div>
 <div class="sect4">
 <h5 id="_equipment">Equipment</h5>
-<div class="paragraph"><p>The Equipment tab allows one to enter information about the type of
-cylinder and gas used as well as the weights used for the dive. The
-message in a blue box at the top of the panel:</p></div>
+<div class="paragraph"><p>The Equipment tab lets you enter information about the type of
+cylinder and gas used, as well as the weights used for the dive. The
+message in the blue box at the top of the panel:</p></div>
 <div class="imageblock" style="text-align:center;">
 <div class="content">
 <img src="images/BlueEditBar_f22.jpg" alt="FIGURE: Blue edit bar" />
 </div>
 </div>
-<div class="paragraph"><p>indicates that the dive is being edited. This is a highly interactive part of
+<div class="paragraph"><p>shows the dive is being edited. This is a highly interactive part of
 <em>Subsurface</em> and the information on
-cylinders and gases (entered here) determines the behaviour of the <strong>Dive profile</strong>
+cylinders and gases (entered here) determines the behavior of the <strong>Dive profile</strong>
 (top right-hand panel).</p></div>
 <div class="paragraph" id="cylinder_definitions"><p><strong>Cylinders</strong>: The cylinder information is entered through a dialogue that looks
 like this:</p></div>
@@ -1324,13 +1377,13 @@ like this:</p></div>
 </div>
 </div>
 <div class="paragraph"><p>For hand-entered dives, this information needs to be typed in. For dive computers,
-<em>Subsurface</em> often obtains the gas used from the dive computer and
+<em>Subsurface</em> often gets the gas used from the dive computer and
 automatically inserts the gas composition(% oxygen or % helium) in the table. The + button
-at the top right allows the user to add more cylinders for this dive. The dark
-dustbin icon on the left allows the deletion of information for a cylinder.
+at the top right lets you add more cylinders for this dive. The dark
+dust bin icon on the left lets you delete information for a cylinder.
 Note that it is not possible to delete a cylinder if it is used during the
-dive. A cylinder might be implicitly used in the dive, even without a gas change event.</p></div>
-<div class="paragraph"><p>The user should start by selecting a cylinder type on the left-hand side of the
+dive. A cylinder might be implicitly used in the dive, even without a gas change event.
+Start by selecting a cylinder type on the left-hand side of the
 table.  To select a cylinder, the <em>Type</em> box should be clicked. This
 brings up a list button that can be used to display a dropdown list of
 cylinders:</p></div>
@@ -1340,7 +1393,7 @@ cylinders:</p></div>
 </div>
 </div>
 <div class="paragraph"><p>The drop-down list can then be used to select the cylinder type that was used
-for this dive or the user may start typing in the box which shows the available
+for this dive, or just start typing in the box which shows the available
 options for the entered characters. The
 <strong>Size</strong> of the cylinder as well as its working pressure (<em>Work.press</em>) will
 automatically be shown in the dialogue.</p></div>
@@ -1355,7 +1408,7 @@ information for the cylinder, save the data
 either by pressing <em>ENTER</em> on the keyboard or by clicking outside the cell
 containing
 the cursor. Information for any additional cylinders can be added by using the<br />
-button at the top right hand. Following is an example of a complete description
+button at the top right hand. The following is an example of a complete description
 for a dive using two cylinders (air and EAN50):</p></div>
 <div class="imageblock" style="text-align:center;">
 <div class="content">
@@ -1363,8 +1416,8 @@ for a dive using two cylinders (air and EAN50):</p></div>
 </div>
 </div>
 <div class="paragraph"><p><strong>Weights</strong>: Information about the weight system used can be entered
-using a dialogue very similar to that of the cylinder information. If one
-clicks
+using a dialogue similar to that of the cylinder information. If you
+click
 the + button on the top right of the weights dialogue, the table looks like
 this:</p></div>
 <div class="imageblock" style="text-align:center;">
@@ -1380,17 +1433,17 @@ down-arrow:</p></div>
 </div>
 </div>
 <div class="paragraph"><p>This can be used to select the type of weight system
-used during the dive or the user may start typing in the box
+used during the dive or just may start typing in the box
 to specify a different weighting mechanism that will be saved by <em>Subsurface</em>.
 In the <strong>Weight</strong>
 field, type in the amount of weight used during the dive. After
 specifying the weight
-system, save the data by either pressing <em>ENTER</em> on the keyboard or by clicking outside the
+system, save the data by pressing <em>ENTER</em> on the keyboard or by clicking outside the
 cell with the cursor.
-It is possible to enter information for more than one weight system by adding
+It’s possible to enter information for more than one weight system by adding
 an additional system
 using the + button on the top right hand. Weight systems can be deleted using
-the dustbin icon on the left hand. Here is an example of information for a dive
+the dust bin icon on the left hand. Here is an example of information for a dive
 with two types of weights: integrated as well as a weight belt:</p></div>
 <div class="imageblock" style="text-align:center;">
 <div class="content">
@@ -1402,26 +1455,27 @@ with two types of weights: integrated as well as a weight belt:</p></div>
 <div class="sect3">
 <h4 id="_editing_several_selected_dives_simultaneously">5.2.5. Editing several selected dives simultaneously</h4>
 <div class="paragraph"><p><em>METHOD 1</em>: After uploading dives from
-a dive computer, the dive profiles of each uploaded dive is shown in the <strong>Dive profile</strong> tab, as well
+a dive computer, the dive profiles of each is shown in the <strong>Dive profile</strong> tab, as well
 as a few items of information
 in the <strong>Notes</strong> tab (e.g. water temperature) and in the <strong>Equipment</strong> tab (e.g. gas pressures
-and gas composition). However the other fields remain empty.
+and gas composition). Other fields remain empty.
 It may be useful to simultaneously edit some of the
-fields in the <strong>Notes</strong> and <strong>Equipment</strong> tabs.  For instance, it is possible
-that a diver performed several dives during a single day, using identical equipment while diving at the same
-dive site or with the same dive master and/or buddy or tags. Instead of completing the information for each
-of these dives separately, one can select all the dives for that day in the <strong>Dive List</strong> and
+fields in the <strong>Notes</strong> and <strong>Equipment</strong> tabs.  For instance, it’s possible
+that a diver performed several dives during a single day, using identical equipment at the same
+dive site, or with the same divemaster and/or buddy or tags. Instead
+of completing the information for each
+dive separately, 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
+identical information. This is done 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,
+<div class="paragraph"><p>Simultaneous editing only works with fields that do not already contain information.
+This means 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
+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
+changed, even though several dives have been selected in the <strong>Dive List</strong>. This 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>.
@@ -1433,15 +1487,15 @@ All the selected dives now contain the data initially selected in the original s
 </div>
 <div class="sect3">
 <h4 id="_adding_bookmarks_to_a_dive">5.2.6. Adding Bookmarks to a dive</h4>
-<div class="paragraph"><p>Many divers wish to annotate their dives with text that indicate particular events
-during the dive, e.g. "Saw dolphins", or "Released surface buoy". This is easily
+<div class="paragraph"><p>Many divers wish to annotate dives with text that indicate particular events,
+e.g. "Saw dolphins", or "Released surface buoy". This is easily
 done:</p></div>
 <div class="ulist"><ul>
 <li>
 <p>
 Right-click at the appropriate point on the dive profile.
    This brings up the dive profile context menu. Select <em>Add bookmark</em>. A red flag is
-   placed on the dive profile at the point that was initially selected (see <strong>A</strong> below).
+   placed on the dive profile at that point (see <strong>A</strong> below).
 </p>
 </li>
 <li>
@@ -1457,7 +1511,7 @@ A text box is shown. Type the explanatory text for the bookmark (see <strong>C</
 </li>
 <li>
 <p>
-If one hovers using the mouse over the red bookmark, the appropriate text is shown at
+Hovering the mouse over the red bookmark, the appropriate text is shown at
    the bottom of the information box (see <strong>D</strong> below).
 </p>
 </li>
@@ -1475,22 +1529,21 @@ saved by using the
 two buttons on the top right hand of the <strong>Notes</strong> tab. If the <em>Apply changes</em> button
 is clicked,
 the dive data are saved in the memory image of the dive. If the <em>Discard changes</em>
-button is clicked, then the newly entered dive data are
+button is clicked, the newly entered dive data are
 erased from the computer memory, although the dive profile is
 retained. When the user exits <em>Subsurface</em> there is a final prompt to confirm
-that the new data should now be saved permanently on the computer disk.</p></div>
+the new data should now be saved permanently on the computer disk.</p></div>
 </div>
 </div>
 <div class="sect2">
 <h3 id="_importing_dive_information_from_other_digital_data_sources_or_other_data_formats">5.3. Importing dive information from other digital data sources or other data formats</h3>
-<div class="paragraph" id="S_ImportingAlienDiveLogs"><p>If a user has been diving for some time, it is possible that several dives were
-logged using other dive log software. This information does not need retyping
-because these dive logs can probably be
+<div class="paragraph" id="S_ImportingAlienDiveLogs"><p>If you’ve been diving for some time, it’s possible several dives were
+logged using other dive log software. These dive logs can probably be
 imported into <em>Subsurface</em>. <em>Subsurface</em> will import dive logs from a range of
 other
-dive log software. While some software is supported natively, for others the
-user has to
-export the logbook(s) to an intermediate format so that they can then be imported
+dive log software. While some software is supported natively, for
+others you will need to
+export the logbook(s) to an intermediate format so they can then be imported
 by <em>Subsurface</em>.
 Currently, <em>Subsurface</em> supports importing CSV log files from several sources.
 APD LogViewer, XP5, Sensus and Seabear files are
@@ -1498,25 +1551,24 @@ preconfigured, but because the import is flexible, users can configure their own
 imports.
 Manually kept log files (e.g. a spreadsheet) can also be imported by
 configuring the CSV import.
-<em>Subsurface</em> can also import UDDF and UDCF files used by some divelog
+<em>Subsurface</em> can also import UDDF and UDCF files used by some dive log
 software and some dive computers, like the Heinrichs &amp; Weikamp DR5. Finally,
-for some divelog software like Mares Dive Organiser it is currently suggested to
-import the logbooks first into a webservice like <em>divelogs.de</em> and then import
-them from there with
-<em>Subsurface</em>, as divelogs.de supports a few additional logbook formats that
-<em>Subsurface</em> currently cannot parse.</p></div>
-<div class="paragraph"><p>If the format of other software is supported natively on Subsurface, it should be sufficient to select
+for some dive log software like Mares Dive Organizer we currently recommend you
+import the logbooks first into a web service like <em>divelogs.de</em> and then import
+from there with
+<em>Subsurface</em>. Divelogs.de supports a few additional logbook formats that
+<em>Subsurface</em> currently cannot handle.</p></div>
+<div class="paragraph"><p>If the format of other software is supported natively on Subsurface, select
 either <em>Import &#8594;  Import log files</em> or <em>File &#8594;  Open log file</em>. <em>Subsurface</em> supports the data formats
 of many dive computers, including Suunto and Shearwater. When importing dives, <em>Subsurface</em>
 tries to detect multiple records for
 the same dive and merges the information as best as it can. If
 there are no time zone issues (or other reasons that would cause the
 beginning time of the dives to be significantly different) <em>Subsurface</em>
-will not create duplicate entries. Below follows more specific information
-to achieve data import to <em>Subsurface</em>.</p></div>
-<div class="sect3">
-<h4 id="_using_the_universal_import_dialogue">5.3.1. Using the universal import dialogue</h4>
-<div class="paragraph" id="Unified_import"><p>Importing dives from other software is performed through a universal interface
+will not create duplicate entries. Below is more specific information
+to import data to <em>Subsurface</em>.
+==== Using the universal import dialogue</p></div>
+<div class="paragraph" id="Unified_import"><p>Importing dives from other software is done through a universal interface
 activated by selecting <em>Import</em> from the Main Menu, then clicking on
 <em>Import Log Files</em>. This brings up dialogue <strong>A</strong>, below.</p></div>
 <div class="imageblock" style="text-align:center;">
@@ -1525,7 +1577,7 @@ activated by selecting <em>Import</em> from the Main Menu, then clicking on
 </div>
 </div>
 <div class="paragraph"><p>Towards the bottom right is a dropdown selector with a default label
-of <em>Dive Log Files</em> which gives access to the different types of direct imports
+of <em>Dive Log Files</em> which accesses different types of direct imports
 available, as in dialogue <strong>B</strong>, above. Currently these are:</p></div>
 <div class="ulist"><ul>
 <li>
@@ -1590,12 +1642,11 @@ CSV (text-based and spreadsheet-based) dive logs, including APD CCR logs
 </li>
 </ul></div>
 <div class="paragraph"><p>Selecting the appropriate format and then the specific log file in the large window
-containing the file list on the right of the dialogue opens
-the imported dive log in the <em>Subsurface</em> <strong>Dive List</strong>. Some other formats, not
+containing the file list on the right of the dialogue, opens
+the imported dive log in the <em>Subsurface</em> <strong>Dive List</strong>. Some other formats not
 accessible through the Import dialogue are also supported, as explained below.</p></div>
-</div>
 <div class="sect3">
-<h4 id="_importing_from_ostctools">5.3.2. Importing from  OSTCTools</h4>
+<h4 id="_importing_from_ostctools">5.3.1. Importing from  OSTCTools</h4>
 <div class="paragraph"><p><em>OSTC Tools</em> is a Microsoft-based suite of dive download and dive management tools for the OSTC
 family of dive computers. <em>OSTC Tools</em> downloads dive data from the dive computer and stores it
 as a binary file with file extension <em>.dive</em> . Subsurface can directly import these files when using
@@ -1603,25 +1654,25 @@ the universal import dialogue. From the dropdown list at the bottom right select
 <em>OSTCTools Files (.dive .DIVE)</em>. This makes the <em>OSTC Tools</em> dive logs visible in the file list
 panel. Select one or more dive, then click the <em>Open</em> button. The OSTC dives are shown in the
 <strong>Dive List</strong> panel.</p></div>
-<div class="paragraph"><p>Actually, all H&amp;W devices supported by OSTCTools can be imported to <em>Subsurface</em>, this includes
+<div class="paragraph"><p>All H&amp;W devices supported by OSTCTools can be imported to <em>Subsurface</em>. This includes
 OSTC, OSTC Mk2, OSTC 2N/2C, OSTC3, OSTC Sport, and probably although untested, Frog, OSTC2 and
 OSTC CR.</p></div>
-<div class="paragraph"><p>Please, remember that OSTCTools is <strong>not</strong> a true diving log software, but a useful set of tools
-for analysis and management of OSTC devices. This way, only raw dive computer data will be
-performed with the import to <em>Subsurface</em>; one has to to manually complete the rest of
-data which may be important (buddies, equipment, notes, etc).</p></div>
+<div class="paragraph"><p>Please remember that OSTCTools is <strong>not</strong> a true diving log software, but rather a useful set of tools
+for analysis and management of OSTC devices. Only raw dive computer data will be
+imported to <em>Subsurface</em>; you have to manually complete the rest of the
+data you want (buddies, equipment, notes, etc).</p></div>
 </div>
 <div class="sect3">
-<h4 id="_importing_from_mares_dive_organiser_v2_1">5.3.3. Importing from Mares Dive Organiser V2.1</h4>
-<div class="paragraph"><p>Since Mares utilise proprietary Windows software not compatible with
+<h4 id="_importing_from_mares_dive_organizer_v2_1">5.3.2. Importing from Mares Dive Organizer V2.1</h4>
+<div class="paragraph"><p>Since Mares uses proprietary Windows software not compatible with
 multi-platform applications, these dive logs cannot be
 directly imported into
 <em>Subsurface</em>. Mares dive logs need to be imported using a three-step process,
-using <em>www.divelogs.de</em> as a mechanism to extract the dive log information.</p></div>
+using <em>www.divelogs.de</em> as a gateway to extract the dive log information.</p></div>
 <div class="olist arabic"><ol class="arabic">
 <li>
 <p>
-Export the dive log data from Mares Dive Organiser to the user&#8217;s
+Export the dive log data from Mares Dive Organizer to your
    desktop, using
    a <em>.sdf</em> file name extension. Refer to <a href="#Mares_Export">Appendix C</a> for more
    information.
@@ -1629,12 +1680,12 @@ Export the dive log data from Mares Dive Organiser to the user&#8217;s
 </li>
 <li>
 <p>
-Data should then be imported into <em>www.divelogs.de</em>. One needs to create a user
+Data should then be imported into <em>www.divelogs.de</em>. You will first need to create a user
    account in
-   <em>www.divelogs.de</em>, log into that web site, then
-   select <em>Import Logbook &#8594;  Dive Organiser</em> from the menu on the left hand side.
+   <em>www.divelogs.de</em>.  Log into that web site, then
+   select <em>Import Logbook &#8594;  Dive Organizer from the menu on the left hand side.
    The instructions must be carefully followed to transfer the dive information
-   (in <em>.sdf</em> format) from the Dive Organiser database to <em>www.divelogs.de</em>.
+   (in _.sdf</em> format) from the Dive Organizer database to <em>www.divelogs.de</em>.
 </p>
 </li>
 <li>
@@ -1646,16 +1697,16 @@ Finally,  import the dives
 </ol></div>
 </div>
 <div class="sect3">
-<h4 id="S_ImportingDivelogsDe">5.3.4. Importing dives from <strong>divelogs.de</strong></h4>
-<div class="paragraph"><p>The import of dive information from <em>divelogs.de</em> is simple, using a single
+<h4 id="S_ImportingDivelogsDe">5.3.3. Importing dives from <strong>divelogs.de</strong></h4>
+<div class="paragraph"><p>Importing dive information from <em>divelogs.de</em> is simple, using a single
 dialogue box. The <em>Import &#8594;  Import from Divelogs.de</em> option should be selected
 from the Main Menu. This
 brings up a dialogue box (see image <strong>A</strong> below). Enter a
-user-ID and password for <em>divelogs.de</em> into the appropriate fields and then
+user-ID and password for <em>divelogs.de</em>  and then
 select
 the <em>Download</em> button. Download from <em>divelogs.de</em> starts immediately,
 displaying a progress bar in the dialogue box. At the end of the download, the
-success status is indicated (see image <strong>B</strong>, below). The
+success status is shown (see image <strong>B</strong>, below). The
 <em>Apply</em> button should then be selected, after which the imported dives appear in the
 <em>Subsurface</em> <strong>Dive List</strong> panel.</p></div>
 <div class="imageblock" style="text-align:center;">
@@ -1665,11 +1716,11 @@ success status is indicated (see image <strong>B</strong>, below). The
 </div>
 </div>
 <div class="sect3">
-<h4 id="S_ImportingCSVData">5.3.5. Importing data in CSV format</h4>
+<h4 id="S_ImportingCSVData">5.3.4. Importing data in CSV format</h4>
 <div class="paragraph"><p>A comma-separated file (.csv) can be used to import dive information either as dive profiles
 (as in the case of the APD Inspiration and Evolution closed circuit rebreathers) or as dive
 metadata (in case the user keeps dive data in a spreadsheet). The <em>CSV</em> format is a universal
-simplified format that allows for easy information exchange between different computers or
+simplified format that allows easy information exchange between different computers or
 software packages. For an introduction to CSV-formatted files see <a href="#S_CSV_Intro">A Diver&#8217;s
 Introduction To CSV Files</a>. <em>Subsurface</em> dive logs can also be exported in <em>CSV</em> format to
 other software that reads this format. See <a href="#S_Appendix_D">APPENDIX D: Exporting a spreadsheet
@@ -1677,7 +1728,7 @@ to CSV format</a> for information that may be helpful for importing spreadsheet-
 into <em>Subsurface</em>.</p></div>
 <div class="sect4">
 <h5 id="S_ImportingCSVDives">Importing dives in CSV format from dive computers or other dive log software</h5>
-<div class="paragraph"><p>One can view a <em>CSV</em> file by using an ordinary text editor. It is normally organised into
+<div class="paragraph"><p>You can view a <em>CSV</em> file by using an ordinary text editor. It’s normally organized into
 a single line that provides the headers (or <em>field names</em> or <em>column headings</em>) of the data
 columns, followed by the data, one record per line.</p></div>
 <div class="paragraph"><p>There are two types of <em>CSV</em> dive logs that can be imported into <em>Subsurface</em>:</p></div>
@@ -1686,8 +1737,8 @@ columns, followed by the data, one record per line.</p></div>
 <p>
 <em>CSV dive details</em>: This dive log format contains similar information to that of a
    typical written dive log, e.g. dive date and time, dive depth, dive duration, names of
-   buddy and dive master and perhaps some information about cylinder pressures before and
-   after the dive, as well as a comment or two about the dive. All the data for a single
+   buddy and divemaster and information about cylinder pressures before and
+   after the dive, as well as comments about the dive. All the data for a single
    dive go on a single line of text, following the order of the column headings.
 </p>
 </li>
@@ -1695,7 +1746,7 @@ columns, followed by the data, one record per 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
+   temperature, 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
@@ -1704,7 +1755,7 @@ columns, followed by the data, one record per line.</p></div>
 </p>
 </li>
 </ol></div>
-<div class="paragraph"><p>Before being able to import the <em>CSV</em> data to <em>Subsurface</em> <strong>one needs to know a few
+<div class="paragraph"><p>Before being able to import the <em>CSV</em> data to <em>Subsurface</em> <strong>you needs to know a few
 things about the data being imported</strong>:</p></div>
 <div class="olist loweralpha"><ol class="loweralpha">
 <li>
@@ -1731,7 +1782,7 @@ Is the numeric information (e.g. dive depth) in metric or in imperial units?
 </p>
 </li>
 </ol></div>
-<div class="paragraph"><p>Armed with this information, importing the data into <em>Subsurface</em> is
+<div class="paragraph"><p>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
@@ -1742,21 +1793,21 @@ appears as depicted below:</p></div>
 <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>
+<div class="paragraph"><p>At the top left, there is a dropdown list containing pre- configured
+settings for common dive computers and software packages.
+ If the <em>CSV</em> file being imported originated from any of
+these pre-configured items, select it. Otherwise use the <em>Manual Import</em>
 option. The configuration panel also has dropdown lists for the specification of the appropriate
 field separator (Tab, comma or semicolon), the date format used in the <em>CSV</em> file,
 the time units (seconds, minutes or minutes:seconds), as well as the unit system
 (metric or imperial). Selecting the appropriate options among these is critical for
-the successful import of the data.</p></div>
-<div class="paragraph"><p>The last remaining task is to ensure that all the data columns have the appropriate
+the successful data import.</p></div>
+<div class="paragraph"><p>Complete this by ensuring that all the data columns have the appropriate
 column headings. The top blue row of the data table contains the column
 headings found in the <em>CSV</em> data file. The blue row of balloons immediately above these
 contains the names understood by <em>Subsurface</em>. These balloons can be moved using a drag-and-drop action. For
 instance, <em>Subsurface</em> expects the column heading for Dive number (" # ") to be "Dive # ". If
-the column heading that <em>Subsurface</em> expects is not in the blue row, then drag the
+the column heading that <em>Subsurface</em> expects is not in the blue row, drag the
 appropriate balloon from the upper area and drop it in the appropriate blue
 cell at the top of the table. To indicate the correct column for "Dive #", drag
 the ballooned item labelled "Dive # " and drop it in the blue
@@ -1767,9 +1818,9 @@ the image below.</p></div>
 <img src="images/csv_import2_f20.jpg" alt="FIGURE: CSV download dialogue 2" />
 </div>
 </div>
-<div class="paragraph"><p>Continue in this way to ensure that all the column headings in the blue row of
-cells correspond to the headings listed in the top part of the dialogue. Having
-completed this task, select the <em>OK</em> button to the bottom right of the dialogue.
+<div class="paragraph"><p>Continue in this way to ensure all the column headings in the blue row of
+cells correspond to the headings listed in the top part of the dialogue.
+When finished, select the <em>OK</em> button on the bottom right of the dialogue.
 The data from the <em>CSV</em> file are imported and shown in the <strong>Dive List</strong> panel.</p></div>
 <div class="sidebarblock" id="S_CSV_Intro">
 <div class="content">
@@ -1780,23 +1831,23 @@ The data from the <em>CSV</em> file are imported and shown in the <strong>Dive L
 <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.
+file format that lets you view or edit information using a text editor like
+Notepad (Windows), gedit (Linux) or TextWrangler (OS/X). There are two main advantages of
+the <em>CSV</em> format.  First, the data are easily editable as text without any proprietary software.
+Second, all information is human-readable, not obscured by any custom or
+proprietary attributes that proprietary software inserts 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>
+be used to import information from other sources like spreadsheet-based dive logs and
+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,
+normally organized 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>
@@ -1839,8 +1890,8 @@ from an APD closed-circuit rebreather (CCR) dive computer:</p></div>
 </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
+<em>CSV</em> files can be used in many contexts for importing data into a <em>Subsurface</em> dive log.
+Knowing a few basic things about the content of the <em>CSV</em> file helps with a smooth import
 of the dives into <em>Subsurface</em>.</p></div>
 </div></div>
 <div class="admonitionblock">
@@ -1848,7 +1899,7 @@ of the dives into <em>Subsurface</em>.</p></div>
 <td class="icon">
 <img src="images/icons/important.png" alt="Important" />
 </td>
-<td class="content">The <em>CSV</em> import has a couple of caveats. One should avoid some special characters
+<td class="content">But, the <em>CSV</em> import has a couple of caveats. Avoid some special characters
 like ampersand (&amp;), less than (&lt;), greater than (&gt;) and double quotes (") as part
 of the numbers or text within a cell. The
 file should use UTF-8 character set, if using non-ASCII characters. Also the
@@ -1866,11 +1917,10 @@ a smaller file to make sure everything works.</td>
 <div class="paragraph"><p>Using the <strong>Subsurface Companion App</strong> on an <em>Android device</em>   or
 <a href="#S_iphone"><em>iPhone</em></a> with GPS, the coordinates
 for the diving
-location can be automatically passed to the <em>Subsurface</em>
-dive log. The Companion App stores the dive locations on
-a dedicated Internet file server. <em>Subsurface</em>, in turn, can collect
-the localities from the file server.</p></div>
-<div class="paragraph"><p>To do this:</p></div>
+location can be automatically passed to the <em>Subsurface</em> dive log. The Companion App
+stores dive locations on a dedicated Internet server. <em>Subsurface</em> can collect
+the locations from the server.
+To do this:</p></div>
 <div class="sect3">
 <h4 id="_create_a_companion_app_account">5.4.1. Create a Companion App account</h4>
 <div class="ulist"><ul>
@@ -1878,7 +1928,7 @@ the localities from the file server.</p></div>
 <p>
 Register on the <a href="http://api.hohndel.org/login/"><em>Subsurface companion web page</em></a>.
   A confirmation email with instructions and a personal <strong>DIVERID</strong> will be sent,
-  a long number that gives access to the file server and Companion App capabilities.
+  a long number giving you access to the file server and Companion App capabilities.
 </p>
 </li>
 <li>
@@ -1897,23 +1947,23 @@ Download the app from
 <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
+<em>Create a new account.</em>  Equivalent to registering in the <em>Subsurface</em> companion
+  page using an Internet browser. You can request a <strong>DIVERID</strong> using this option,
+  but it’s supplied via email and followed up by interaction with the
+  <a href="http://api.hohndel.org/login/"><em>Subsurface companion web page</em></a> 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
+<em>Retrieve an account.</em>  If users forget 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
+  this <strong>DIVERID</strong> and doesn’t ask for it again unless you use the <em>Disconnect</em> menu
   option (see below).
 </p>
 </li>
@@ -1925,18 +1975,18 @@ Download the app from
 </td>
 <td class="content">In the <em>Subsurface</em> main program, the <strong>DIVERID</strong> should also be entered on the
 Default Preferences
-panel, obtained by selecting <em>File &#8594;  Preferences &#8594;  Defaults</em> from the main menu
+panel, 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>
+This helps synchronization 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
+<div class="paragraph"><p>Now you are 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="paragraph"><p>Touch the "+" icon on the top right to add a new dive site, a menu
+shows with 3 options:</p></div>
 <div class="ulist"><ul>
 <li>
 <p>
@@ -1946,13 +1996,13 @@ Current: A prompt for a place name (or a request to activate the GPS if it is tu
 </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
+Use Map: This option lets you fix a position by searching a world map. A
+  world map is shown (see <strong>B</strong> below) on which you can show 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
+  sensitive screen (if the marked location is wrong, simply choose a new location)
+  and select the check symbol in the upper right. A dialog is shown letting you enter the
+  name of the dive location and the date and time of the dive (see <strong>C</strong> below). In order to import this
+  dive location in <em>Subsurface</em> you should set the time to agree with the time of
   that dive on the dive computer.
 </p>
 </li>
@@ -1967,7 +2017,7 @@ Use Map: This option allows the user to fix a position by searching a world map.
 <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
+  locations shown. Now 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>
@@ -1978,15 +2028,15 @@ Import local GPX file: The android device searches for .gpx files and located
 <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
+showing they need to be uploaded to the server. You
 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>
+check mark in the selection box on the left. Group operations (like  <em>Delete</em> or <em>Send</em>)
+are performed on several selected locations.</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
+map showing them. 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
+of locations or from the map (see <strong>B</strong> below). If you select a location (on the list
 or on the map), an editing
 panel opens (see <strong>C</strong> below) where the dive description or other details may be changed.</p></div>
 <div class="imageblock" style="text-align:center;">
@@ -1994,7 +2044,7 @@ panel opens (see <strong>C</strong> below) where the dive description or other d
 <img src="images/Companion_4.jpg" alt="FIGURE: Companion App, add location using map" />
 </div>
 </div>
-<div class="paragraph"><p>When one selects a dive (<strong>not</strong> selecting the check box), the
+<div class="paragraph"><p>When you select a dive (<strong>not</strong> selecting the check box), the
 name given to it, date/time and GPS coordinates will be shown, with two options at the top
 of the screen:</p></div>
 <div class="ulist"><ul>
@@ -2006,16 +2056,17 @@ Edit (pencil):  Change the text name or other characteristics of the dive locati
 <li>
 <p>
 Maps:  Display a map showing the dive location.
+After editing and saving a dive location (see <strong>C</strong> above),
+upload it to the web
+service, as explained below.
 </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
+The easiest is 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">
@@ -2023,7 +2074,7 @@ top right of the screen.</p></div>
 <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;
+<td class="content">Be careful! The trash icon on the right means exactly what it should;
 it deletes the selected dive location(s).</td>
 </tr></table>
 </div>
@@ -2050,19 +2101,14 @@ downloaded to a <em>Subsurface</em> dive log (see below).</p></div>
 <li>
 <p>
 <em>User ID.</em> The DIVERID obtained by registering as described above. The easiest way to
-  obtain it is simply to copy and paste from the confirmation email but, of
-  course, users can also type this information.
+  get it is to copy and paste from the confirmation email or just type it in.
+===== Synchronisation
 </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.
+  on the web service synchronize each time the app is started.
 </p>
 </li>
 <li>
@@ -2075,9 +2121,9 @@ downloaded to a <em>Subsurface</em> dive log (see below).</p></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="paragraph"><p>Instead of entering an unique dive location, you can leave the service running
+in the background of your Android device, allowing a continuous collection of GPS locations.</p></div>
+<div class="paragraph"><p>The settings below define the behavior of the service:</p></div>
 <div class="ulist"><ul>
 <li>
 <p>
@@ -2101,13 +2147,13 @@ in the background of their Android device, allowing the continuous collection of
 <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
+<td class="content"><em>How does the background service work?</em> Assuming the diver sets 5 minutes and 50
 meters in the settings above, the app will start by recording a location at the current
 location, followed by another one at every 5 minutes <strong>or</strong> every time one moves 50 m
 from previous location.
 If subsequent locations are within a radius of 50 meters from the previous one,
-a new location is not saved. If the user is not moving, only one location is saved,
-but if the user is moving, a trace of the route is obtained by saving a
+a new location is not saved. If the diver is not moving, only one location is saved.
+If the diver is moving, a trace of the route is obtained by saving a
 location every 50 meters.</td>
 </tr></table>
 </div>
@@ -2139,15 +2185,15 @@ Subsurface mailing list.
 </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 class="paragraph"><p>Starts 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
+<div class="paragraph"><p>This is admittedly a badly named option that disconnects the app from the server.
+It resets 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
+is useful if your Android device was used to download the dive locations
 of another registered diver.</p></div>
 </div>
 <div class="sect4">
@@ -2157,7 +2203,7 @@ of another registered diver.</p></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
+<div class="paragraph"><p>The iPhone interface is quite simple. 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;">
@@ -2165,15 +2211,19 @@ during registration) into the space reserved for it, then select "Dive in"
 <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
+<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,
+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 adding 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
+of the screen. After the dive, 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
+service is running you can only add dives manually.</p></div>
+<div class="paragraph"><p>You 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
+to the web service. There isn’t an option to
 trigger upload manually.</p></div>
 </div>
 <div class="sect3">
@@ -2183,30 +2233,30 @@ trigger upload manually.</p></div>
 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
+DIVERID, then select the <em>Download</em> button to start 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
+<div class="paragraph"><p>Note that the <em>Apply</em> button is now active. By clicking on it, you can update the locations
+of the newly entered or uploaded dives in <em>Subsurface</em>. That applies the
+coordinates and names entered on the app to all the new dives that match the
+date-times of the uploaded GPS localities. If you have 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
+dive computer based on date-time data, automatic assignment of GPS data to dives depends
+on agreeing date-time information between the two devices. Although <em>Subsurface</em> has
+a wide range tolerance, it may not be able to identify the appropriate dive if there&#8217;s
+a large difference between the time in the dive computer and that of the Android device.
+That results 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).
+<em>Subsurface</em> may also 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>
+A workaround 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">
@@ -2220,12 +2270,12 @@ downloading GPS data.</p></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
+<em>Background service</em> may fill the location list with
+  unnecessary locations that don’t correspond to the exact dive point but do correspond to the boat&#8217;s route.
+   Right now, these locations are difficult to delete from the server. In some situations it
+  is better 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).
+  instance, if you want to keep the location list clear to see dives in the web service map display (see above).
 </p>
 </li>
 <li>
@@ -2241,11 +2291,11 @@ It may also make sense to give informative names to the locations sent to the we
 <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
+during a dive. To match each photograph with a specific
+dive, <em>Subsurface</em> lets you 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>
+<h4 id="_loading_photos_and_synchronizing_between_dive_computer_and_camera">5.5.1. Loading photos and synchronizing 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;">
@@ -2260,58 +2310,58 @@ to be loaded into <em>Subsurface</em> and click the <em>Open</em> button.</p></d
 <img src="images/LoadImage2_f20.jpg" alt="FIGURE: Load images option" />
 </div>
 </div>
-<div class="paragraph"><p>This brings up the time synchronisation dialog, shown below. The
-critical problem is that the time
-synchronisation is not perfect between the dive computer used during a dive,
+<div class="paragraph"><p>This brings up the time synchronization dialog, shown below. But be
+aware that the time
+synchronization is not perfect between the dive computer used during a dive,
 and the camera used during that same dive. These two devices
-often differ by several minutes. If <em>Subsurface</em> can achieve synchronisation,
+often differ by several minutes. If <em>Subsurface</em> can synchronize,
 then the exact times of photographs can be used to position photographs on
 the dive profile.</p></div>
-<div class="paragraph"><p><em>Subsurface</em> achieves this synchronisation in three ways:</p></div>
+<div class="paragraph"><p><em>Subsurface</em> synchronizes in three ways:</p></div>
 <div class="ulist"><ul>
 <li>
 <p>
-<strong>Pro-actively</strong>: Before the dive, ensure synchronisation of the dive computer time settings with
+<strong>Pro-actively</strong>: Before the dive, ensure synchronization of the dive computer time settings with
   the time settings of the camera by changing the date-time settings on one or both of these devices.
 </p>
 </li>
 <li>
 <p>
-<strong>Manually</strong>: If the user wrote down the exact camera time at the start of a dive, the
-  difference in time between the two devices can be determined. Actually, as long as the device
-  settings for time has not been changed in either device, one could write down the times of
-  both devices after the dive or even at the end of the day. One can then manually set the time
+<strong>Manually</strong>: If you wrote down the exact camera time at the start of a dive, the
+  difference in time between the two devices can be determined. As long as the device
+  settings for time has not been changed in either device, you could write down the times of
+  both devices after the dive or even at the end of the day. You can then manually set the time
   difference in the <em>Time shift</em> dialog. Towards the top of the dialog is a time setting tool
-  immediately under the heading <em>Shift times of image(s) by</em>, evident in figure <strong>A</strong> below.
+  immediately under the heading <em>Shift times of image(s) by</em>, shown in figure <strong>A</strong> below.
   If the camera time is 7 minutes later than that of the dive computer, set the time setting
   tool to a value of 00:07.  Select either the <em>earlier</em> or <em>later</em> radio button.
   In the above example, the <em>earlier</em> option is appropriate, since the photos need to be shifted
   7 minutes earlier (camera is 7 minutes ahead of dive computer). Ignore any "AM" or "PM" suffix
-  in that tool. Click the <em>OK</em> button and synchronisation is achieved.
+  in that tool. Click the <em>OK</em> button and synchronization is done.
 </p>
 </li>
 </ul></div>
 <div class="imageblock" style="text-align:center;">
 <div class="content">
-<img src="images/LoadImage3b_f20.jpg" alt="FIGURE: Synchronisation dialog" />
+<img src="images/LoadImage3b_f20.jpg" alt="FIGURE: Synchronization dialog" />
 </div>
 </div>
 <div class="ulist"><ul>
 <li>
 <p>
-<strong>By photograph</strong>: There is a very slick way of achieving synchronisation. If one takes a
-  photograph of the face of the dive computer showing the time, then <em>Subsurface</em> can obtain
-  the exact time the photograph was taken, using the metadata that the camera stores within
-  each photo. In order to do this, use the bottom half of the <em>Time shift</em> dialog. If one uses
+<strong>By photograph</strong>: There is a very slick way of synchronizing. If you take a
+  photograph of the face of the dive computer showing the time, then <em>Subsurface</em> can get
+  the exact time the photograph was taken, using the metadata the camera stores within
+  each photo. To do this, use the bottom half of the <em>Time shift</em> dialog. If you use
   the bottom part, the top part of the dialog is ignored. Click on
-  the horizontal bar entitled "<em>Select image of dive computer showing time</em>. This brings up
-  a file browser with which one can select the photograph of the dive computer time. Select the
+  the horizontal bar called "<em>Select image of dive computer showing time</em>. This brings up
+  a file browser letting you select the photograph of the dive computer time. Select the
   photograph using the file browser and click on <em>OK</em>. This photograph of the dive computer
   appears in the bottom panel of the <em>Shift times</em> dialog. Now <em>Subsurface</em> knows exactly
   when the photograph has been taken. Now set the date-time dialog to the left of the photo
-  so that this tool reflects the date and time of the dive computer in the photo. When the
+  so it reflects the date and time of the dive computer in the photo. When the
   date-time tool has been set, <em>Subsurface</em> knows exactly what the time difference between
-  camera and dive computer is, and synchronisation is achieved.
+  camera and dive computer is, and it can synchronize.
   Image <strong>B</strong> above shows a photograph of the face of the dive computer and with the date-time tool set to the
   date-time.
 </p>
@@ -2333,7 +2383,7 @@ the <em>Photos</em> tab of the <strong>Notes</strong> panel.
 <p>
 as tiny icons (stubs) on the dive profile at the appropriate positions reflecting the time
    each photograph was taken.
-   In order to view the photos on the dive profile, activate the <em>show-photos</em> button in the tool bar
+   To view the photos on the dive profile, activate the <em>show-photos</em> button in the tool bar
    to the left of the dive profile:
 </p>
 </li>
@@ -2349,7 +2399,7 @@ as tiny icons (stubs) on the dive profile at the appropriate positions reflectin
 <img src="images/LoadImage4_f20.jpg" alt="FIGURE: Photos on dive profile" />
 </div>
 </div>
-<div class="paragraph"><p>If one hovers with the mouse over any of the photo icons, then a thumbnail photo
+<div class="paragraph"><p>If you hover the mouse over any of the photo icons, a thumbnail photo
 is shown of the appropriate photo. See the image below:</p></div>
 <div class="imageblock" style="text-align:center;">
 <div class="content">
@@ -2358,10 +2408,10 @@ is shown of the appropriate photo. See the image below:</p></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
+the added photographs. (see the image below). Note that the thumbnail
+has a small dustbin icon in the bottom right hand corner (see image above). Selecting
+the dustbin removes the image from the dive. Be careful
+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">
@@ -2375,43 +2425,42 @@ can also be deleted using the <em>Photos</em> tab (see text below).</p></div>
 panel. Photos taken in rapid succession during a dive (therefore sometimes with large
 overlap on the dive profile) can easily be accessed in the <em>Photos</em> tab. This tab serves as
 a tool for individually accessing the photos of a dive, while the stubs on the dive profile
-give an indication of when during a dive a photo was taken. By single-clicking on a thumbnail in
+show when during a dive a photo was taken. By single-clicking on a thumbnail in
 the <em>Photos</em> panel, a photo is selected. By double-clicking a thumbnail, the full-sized image is
 shown, overlaying the <em>Subsurface</em> window. A photo can be deleted from the <em>Photos</em> panel by selecting
-it (single-click) and then by pressing the <em>Del</em> key on the keyboard. This removes the photo both
+it (single-click) and then by pressing the <em>Del</em> key on the keyboard. This removes the photo BOTH
 from the <em>Photos</em> tab as well as the dive profile.</p></div>
 </div>
 <div class="sect3">
 <h4 id="_photos_on_an_external_hard_disk">5.5.4. Photos on an external hard disk</h4>
-<div class="paragraph"><p>Most underwater photographers store their photos on an external drive. If such a drive can be mapped by the operating system
-(almost always the case) the photos can be directly accessed by <em>Subsurface</em>. This facilitates the interaction
+<div class="paragraph"><p>Most underwater photographers store photos on an external drive. If such a drive can be mapped by the operating system
+(almost always the case) the photos can be directly accessed by <em>Subsurface</em>. This eases the interaction
 between <em>Subsurface</em> and an external repository of photos. When associating a dive profile with photos from an
-external drive, the normal procedure of selection and synchronisation (see text above) is used.
-However, after the external drive has been disconnected, <em>Subsurface</em> cannot access these photos any more.
+external drive, the normal procedure of selection and synchronization (see text above) is used.
+After the external drive has been disconnected, <em>Subsurface</em> cannot access these photos any more.
 If the display of photos is activated (using the toolbox to the left of the <em>Dive Profile</em>), the
 program only shows a small white dot where each photo should be on the dive profile.
-In addition the <em>Photos</em> tab only shows the file names of the photos. This is normal behaviour.
-If, later, the external drive with the photos is connected again, the photos can be seen in the normal way.</p></div>
+In addition the <em>Photos</em> tab only shows the file names of the photos.
+If the external drive with the photos is re-connected, the photos can be seen in the normal way.</p></div>
 </div>
 <div class="sect3">
 <h4 id="S_FindMovedImages">5.5.5. Moving photographs among directories, hard disks or computers</h4>
 <div class="paragraph"><p>After a photograph has been loaded into <em>Subsurface</em> and associated with a specific dive, the directory
- where the photo lies is stored, allowing <em>Subsurface</em> to find the photograph when the dive is
+ where the photo lies is stored, letting <em>Subsurface</em> find the photograph when the dive is
  opened again. If the photo or the whole photo collection is moved to another drive or to a different
- machine, it is unlikely that the directory structure will remain identical to that of the original uploaded
+ machine, the directory structure will be different to that of the original uploaded
  photo. When this happens, <em>Subsurface</em> looks for the photos at their original location before they were moved,
- cannot find them and therefore cannot display them. Because, after moving photos, large numbers of photos
+ cannot find them and cannot display them. Because after moving photos, large numbers of photos
  may need to be deleted and re-imported from the new location, <em>Subsurface</em> has a mechanism that eases the
  process of updating the directory information for each photo: automatic updates using fingerprints.</p></div>
 <div class="paragraph"><p>When a photo is loaded into <em>Subsurface</em>, a fingerprint for the image is calculated and stored with the
  other reference information for that photo. After moving a photo collection (that has already been loaded
- into <em>Subsurface</em>) to a different directory, disk or computer, <em>Subsurface</em> can  perform the
- following steps:</p></div>
+ into <em>Subsurface</em>) to a different directory, disk or computer, <em>Subsurface</em> can:</p></div>
 <div class="ulist"><ul>
 <li>
 <p>
 look through a particular directory (and all its subdirectories recursively) where photos have been moved
- to,
+to,
 </p>
 </li>
 <li>
@@ -2422,12 +2471,12 @@ calculate fingerprints for all photos in this directory, and
 <li>
 <p>
 if there is a match between a calculated fingerprint and the one originally calculated when a photo was
- loaded into <em>Subsurface</em> (even if the original file name has changed), to automatically update the
+ loaded into <em>Subsurface</em> (even if the original file name has changed), automatically update the
  directory information so that <em>Subsurface</em> can find the photo in the new moved directory.
 </p>
 </li>
 </ul></div>
-<div class="paragraph"><p>This is achieved by selecting from the Main Menu: <em>File &#8594;      Find moved images</em>. This brings up a window within
+<div class="paragraph"><p>This is done 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>
@@ -2439,13 +2488,13 @@ if there is a match between a calculated fingerprint and the one originally calc
 <td class="icon">
 <img src="images/icons/important.png" alt="Important" />
 </td>
-<td class="content"><em>Subsurface</em> automatically calculates fingerprints for all images that can be accessed by <em>Subsurface</em>.
-When manipulating images, ensure that all the images associated with the dive log can be accessed by <em>Subsurface</em>.</td>
+<td class="content"><em>Subsurface</em> automatically calculates fingerprints for all images that it can access.
+When manipulating images, be sure all the images associated with the dive log can be accessed by <em>Subsurface</em>.</td>
 </tr></table>
 </div>
 <div class="paragraph"><p><em>Subsurface</em> automatically checks and, if necessary, updates the fingerprints associated with a single dive if:
 - The images associated with that dive are visible as thumbnails on the <strong>Dive Profile</strong>.
-- One edits anything in the <strong>Notes tab</strong> panel and save the edits by selecting <em>Apply changes</em>.</p></div>
+- If you edit anything in the <strong>Notes tab</strong> panel and save the edits by selecting <em>Apply changes</em>.</p></div>
 </div></div>
 </div>
 </div>
@@ -2454,7 +2503,7 @@ When manipulating images, ensure that all the images associated with the dive lo
 <div class="sect3">
 <h4 id="S_MulticylinderDives">5.6.1. Multicylinder dives</h4>
 <div class="paragraph"><p><em>Subsurface</em> easily handles dives involving more than one cylinder. Multi-cylinder diving usually happens
-(a) if a diver does not have enough gas for the complete dive in a single cylinder; (b) if the diver
+(a) if a diver doesn’t have enough gas for the complete dive in a single cylinder; (b) if a diver
 needs more than one gas mixture because of the depth or the decompression needs of the dive. For this reason
 multi-cylinder dives are often used by technical divers who dive deep or long. As far
 as <em>Subsurface</em> is concerned, there are only two types of information that need to be provided:</p></div>
@@ -2463,13 +2512,13 @@ as <em>Subsurface</em> is concerned, there are only two types of information tha
 <p>
 <strong>Describe the cylinders used during the dive</strong> This is performed in the <strong>Equipment tab</strong> of
   the <strong>Info</strong> panel, as <a href="#cylinder_definitions">described above</a>. Enter the cylinders one by one,
-  specifying the characteristics of the cylinder and the gas composition within each cylinder.
+  specifying each’s characteristics and the gas composition within it.
 </p>
 </li>
 <li>
 <p>
-<strong>Record the times at which switches from one cylinder to another was done:</strong> This is information
-  provided by some dive computers (provided the diver indicated these changes to the dive computer
+<strong>Record the times at which the switch from one cylinder to another was done:</strong> This is information
+  tracked by some dive computers (provided the diver indicated these changes to the dive computer
   by pressing specific buttons). If the dive computer does not provide the information, the diver has to
   record these changes using a different method, e.g. writing it on a slate.
 </p>
@@ -2486,9 +2535,9 @@ as <em>Subsurface</em> is concerned, there are only two types of information tha
 </p>
 </li>
 </ul></div>
-<div class="paragraph"><p>Having performed these tasks, <em>Subsurface</em> indicates the appropriate use of cylinders in the dive profile.
+<div class="paragraph"><p>When this is complete, <em>Subsurface</em> indicates the appropriate use of cylinders in the dive profile.
 Below is a multi-cylinder dive, starting off with EAN28, then changing cylinders to EAN50 after 26 minutes
-to perform decompression.</p></div>
+for decompression.</p></div>
 <div class="imageblock" style="text-align:center;">
 <div class="content">
 <img src="images/multicylinder_dive.jpg" alt="FIGURE: Multicylinder profile" />
@@ -2498,19 +2547,19 @@ to perform decompression.</p></div>
 <div class="sect3">
 <h4 id="_sidemount_dives">5.6.2. Sidemount dives</h4>
 <div class="paragraph"><p>Sidemount diving is just another form of multi-cylinder diving, often with both or all cylinders having
-the same gas mixture. Although it is a popular configuration for cave divers, sidemount
-diving can be performed by recreational divers who have completed the appropriate training. Sidemount
-dive logging involves, exactly as with multi-cylinder dives, above, three steps:</p></div>
+the same gas mixture. Although it’s a popular configuration for cave divers, Sidemount
+diving can be done by recreational divers who’ve completed the appropriate training. sidemount
+dive logging involves three steps, exactly as with multi-cylinder dives above:</p></div>
 <div class="ulist"><ul>
 <li>
 <p>
 <strong>During the dive, record cylinder switch events</strong>. Since sidemount diving normally involves two
-  cylinders with air or with the same gas mixture, <em>Subsurface</em> distinguishes among these different
-  cylinders. In contrast, many dive computers that allow gas switching only distinguish among different
-  <em>gases</em> used, not among different <em>cylinders</em> used. This means that when sidemount dives are downloaded
-  from these dive computers, the events of switching between cylinders with the same gas are not downloaded. This may mean
-  that one may have to keep a written log of cylinder switch times using a slate, or (if the dive computer
-  has this facility) marking each cylinder switch with a bookmark that can be retrieved later. Returning
+  cylinders with air or with the same gas mixture, <em>Subsurface</em> distinguishes between these different
+  cylinders. In contrast, many dive computers that allow gas switching only distinguish between different
+  <em>gases</em> used, not among different <em>cylinders</em> used. This means when sidemount dives are downloaded
+  from these dive computers, the switching event between cylinders with the same gas is not downloaded. This may mean
+  that a diver may have to keep a written log of cylinder switch times using a slate, or (if the dive computer
+  has the capability) marking each cylinder switch with a bookmark that can be retrieved later. Returning
   from a dive with the times of cylinder changes is the only tricky part of logging sidemount dives.
 </p>
 </li>
@@ -2524,13 +2573,13 @@ dive logging involves, exactly as with multi-cylinder dives, above, three steps:
 <li>
 <p>
 <strong>Indicate cylinder change events on the <em>Subsurface</em> dive profile</strong>. Once the dive log has been imported
-  from a dive computer into <em>Subsurface</em>, the cylinder switch events need to be indicated on the dive profile.
-  Cylinder changes are recorded by right-clicking at the appropriate point on the dive profile and then
+  from a dive computer into <em>Subsurface</em>, the cylinder switch events need to be shown on the dive profile.
+  Cylinder changes are recorded by right-clicking at the appropriate point on the dive profile, then
   selecting <em>Add gas change</em>. A list of the appropriate cylinders is shown with the
   currently used cylinder greyed out. In the image below Tank 1 is greyed out, leaving only Tank 2
-  to be selected. Select the appropriate cylinder. The cylinder change is then indicated on the dive
+  to be selected. Select the appropriate cylinder. The cylinder change is then shown on the dive
   profile with a cylinder symbol. If the <strong>Tank Bar</strong> is activated using the toolbar to the left of the
-  profile, then the cylinder change is also indicated on the Tank Bar (see image below). After all
+  profile, then the cylinder change is also shown on the Tank Bar (see image below). After all
   the cylinder change events have been recorded on the dive profile, the correct cylinder pressures
   for both cylinders are shown on the dive profile, as in the image below.
 </p>
@@ -2550,17 +2599,17 @@ dive logging involves, exactly as with multi-cylinder dives, above, three steps:
 <td class="icon">
 <img src="images/halcyon_RB80.jpg" alt="Note" />
 </td>
-<td class="content">Passive semi-closed rebreathers (pSCR) comprise a technical advance in diving equipment that
-recirculates the breathing gas that a diver breathes, while removing carbon dioxide from
+<td class="content">Passive semi-closed rebreathers (pSCR) are a technical advance in diving equipment that
+recirculates the breathing gas a diver uses, while removing carbon dioxide from
 the exhaled gas. While a small amount (typically a tenth) of the exhaled breathing gas is released into the water,
 a small amount of fresh gas is released from the back gas cylinder (typically containing nitrox).
-A diver, using a single cylinder of breathing gas can therefore dive for much longer periods than
+A diver using a single cylinder of breathing gas can therefore dive for much longer periods than
 using a recreational open-circuit configuration. With pSCR equipment, a very small amount of breathing
-gas is released every time the breather inhales. With active SCR (aSCR) equipment, in contrast, a small amount of
+gas is released every time the diver inhales. With active SCR (aSCR) equipment, in contrast, a small amount of
 breathing gas is released continuously from the back cylinder.</td>
 </tr></table>
 </div>
-<div class="paragraph"><p>To log pSCR dives, no special procedures are required, just the normal steps outlined above:</p></div>
+<div class="paragraph"><p>To log pSCR dives, no special procedures are required. Use the normal steps outlined above:</p></div>
 <div class="ulist"><ul>
 <li>
 <p>
@@ -2575,8 +2624,8 @@ pSCR diving often involves gas changes, requiring an additional cylinder.
 </p>
 </li>
 </ul></div>
-<div class="paragraph"><p>If a pSCR <em>Dive Mode</em> has been selected, the dive ceiling for pSCR dives is adjusted for the oxygen
-drop across the mouthpiece which often requires longer decompression periods. Below is a dive profile
+<div class="paragraph"><p>If a pSCR <em>Dive Mode</em> has been selected, the dive ceiling for that is adjusted for the oxygen
+drop across the mouthpiece, which often requires longer decompression periods. Below is a dive profile
 of a pSCR dive using EAN36 on the back cylinder and oxygen for decompression. Note that this dive lasted
 over two hours.</p></div>
 <div class="imageblock" style="text-align:center;">
@@ -2593,9 +2642,9 @@ over two hours.</p></div>
 <img src="images/APD.jpg" alt="Note" />
 </td>
 <td class="content">Closed system rebreathers use advanced technology to recirculate
-gas that has been breathed while doing two things to maintain a
+gas that has been breathed. They also do two things to maintain a
 breathable oxygen concentration:
-a) remove carbon dioxide from the gas that has been exhaled
+a) remove carbon dioxide from the exhaled gas
 b) regulate the oxygen concentration to remain within safe diving limits.
 The CCR interface of <em>Subsurface</em> is currently experimental
 and under active development. Subsurface currently supports Poseidon MkVI
@@ -2603,7 +2652,7 @@ and APD Discovery/Evolution dive computers. In contrast to a conventional recrea
 dive computer, a CCR system computer does not allow the download of a log
 containing multiple dives. Rather, each dive is stored independently. This
 means that <em>Subsurface</em> cannot download a dive log directly from a CCR
-dive computer, but that it imports CCR dive logs in the same way that it
+dive computer, but that it imports CCR dive logs in the same way it
 imports dive log data from other digital databases: one dive at a time.</td>
 </tr></table>
 </div>
@@ -2614,12 +2663,12 @@ digital sources</a>. From the main menu of <em>Subsurface</em>, select <em>Impor
 log files</em> to bring up the <a href="#Unified_import">universal import dialogue</a>. As
 explained in that section, the bottom right
 hand of the import dialogue contains a dropdown list (labled <em>Filter:</em>) of appropriate devices
-that currently includes(Poseidon) MkVI or APD log viewer files (import for other
-CCR equipment is under active development). Having selected the appropriate CCR format and
+that currently include(Poseidon) MkVI or APD log viewer files. Import for other
+CCR equipment is under active development. Having selected the appropriate CCR format and
 the directory where the original dive logs have been stored from the CCR dive
-computer, one can select a particular dive log file (in the case of the MkVI
+computer, select a particular dive log file (in the case of the MkVI
 it is a file with a .txt extension). After selecting the appropriate dive log,
-activate the <em>Open</em> button at the bottom right hand of the universal import dialogue.
+click the <em>Open</em> button at the bottom right hand of the universal import dialogue.
 The selected dive is imported to the <em>Subsurface</em> dive list.</p></div>
 </div>
 <div class="sect4">
@@ -2642,7 +2691,7 @@ For TWO O<sub>2</sub> sensors the mean value of the two sensors are given.
 <p>
 For THREE-sensor systems (e.g. APD), the mean value is also used. However
   differences of more than 0,1 bar in the simultaneous readings of different sensors are
-  treated as spurious. If one of the three sensors provides spurious data, it is ignored.
+  treated as false. If one of the three sensors provides false data, it is ignored.
 </p>
 </li>
 <li>
@@ -2654,17 +2703,17 @@ If no sensor data are available, the pO<sub>2</sub> value is assumed to be equal
 <div class="paragraph"><p>The mean pO<sub>2</sub> of the sensors is indicated with a green line,</p></div>
 <div class="paragraph"><p>The oxygen setpoint values as well as the readings from the individual
 oxygen sensors can be shown. The display of additional CCR information is turned on by
-checking the appropriate checkboxes in the <em>Preferences</em> panel (accessible by
+checking the appropriate boxes in the <em>Preferences</em> panel (accessible by
 selecting <a href="#S_CCR_options"><em>File &#8594;  Preferences &#8594;  Graph</em></a>). This part of
 the <em>Preferences</em> panel is shown in the image below, representing two checkboxes that modify
 the display of pO<sub>2</sub> when the appropriate toolbar button on the Dive Profile
-has been activated.</p></div>
+has been checked.</p></div>
 <div class="imageblock" style="text-align:center;">
 <div class="content">
 <img src="images/CCR_preferences_f20.jpg" alt="FIGURE: CCR preferences panel" />
 </div>
 </div>
-<div class="paragraph"><p>Checking any of these check boxes allows the display of additional oxygen-related
+<div class="paragraph"><p>Checking any of these boxes allows the display of additional oxygen-related
 information whenever the pO<sub>2</sub> toolbar button on the <em>Profile</em> panel is activated.
 The first checkbox allows the display of setpoint information. This is a red line
 superimposed on the green oxygen partial pressure graph and allows a comparison of the
@@ -2713,7 +2762,7 @@ are shown as green lines overlapping the depth profile. In addition, start and
 end pressures for both oxygen and diluent cylinders are shown in the <em>Equipment Tab</em>.
 Below is a dive profile for a CCR dive, including an overlay
 of setpoint and oxygen sensor data, as well as the cylinder pressure data. In this
-case there is good agreement from the readings of the two oxygen sensors.</p></div>
+case there is agreement from the readings of the two oxygen sensors.</p></div>
 <div class="imageblock" style="text-align:center;">
 <div class="content">
 <img src="images/CCR_dive_profile_f22.jpg" alt="FIGURE: CCR dive profile" />
@@ -2732,7 +2781,7 @@ by clicking the appropriate button to the left of the dive profile:</p></div>
 <img src="images/icons/cceiling.jpg" alt="DC ceiling icon" />
 </div>
 </div>
-<div class="paragraph"><p>The default colour of the computer-generated deco ceiling is white. However, this can be set to red
+<div class="paragraph"><p>The default color of the computer-generated deco ceiling is white. This can be set to red
 by checking the appropriate check box after selecting <em>File  &#8594;  Preferences  &#8594;  Graph</em>.
 Below is a dive profile indicating the dive computer-generated deco ceiling:</p></div>
 <div class="imageblock" style="text-align:center;">
@@ -2788,7 +2837,7 @@ image showing extra data for a dive using a Poseidon rebreather.</p></div>
 <div class="paragraph"><p>The Stats tab gives summary statistics for more than one dive, assuming that
 more than one dive has been selected in the <strong>Dive List</strong> using the standard
 Ctrl-click or Shift-click of the mouse. If only one
-dive has been selected, figures pertaining to only that dive are given. This tab
+dive has been selected, figures for only that dive are given. This tab
 shows the number of dives selected, the total amount of dive time in these
 dives,
 as well as the minimum, maximum and mean for the dive duration,
@@ -2804,13 +2853,13 @@ shallowest and deepest dives of those selected.</p></div>
 </div>
 <div class="paragraph"><p>Of all the panels in <em>Subsurface</em>, the Dive Profile contains the most detailed
 information about each dive. The Dive Profile has a <strong>button bar</strong> on the left hand side
-that allows control over several display options. The functions of these
+that lets you control several display options. The functions of these
 buttons are described below. The main item in the Dive
 Profile is the graph of
-dive depth as a function of time. In addition to the obvious information of
-the depth it also shows the ascent and descent rates compared to the recommended
+dive depth as a function of time. In addition to
+depth, it also shows the ascent and descent rates compared to the recommended
 speed of going up or down in the water column. This information is given using
-different colours:</p></div>
+different colors:</p></div>
 <div class="tableblock">
 <table rules="all"
 width="100%"
@@ -2821,7 +2870,7 @@ cellspacing="0" cellpadding="4">
 <col width="33%" />
 <tbody>
 <tr>
-<td align="left" valign="top"><p class="table"><strong>Colour</strong></p></td>
+<td align="left" valign="top"><p class="table"><strong>Color</strong></p></td>
 <td align="left" valign="top"><p class="table"><strong>Descent speed (m/min)</strong></p></td>
 <td align="left" valign="top"><p class="table"><strong>Ascent speed (m/min)</strong></p></td>
 </tr>
@@ -2854,7 +2903,7 @@ cellspacing="0" cellpadding="4">
 </table>
 </div>
 <div class="paragraph"><p>The profile also includes depth readings for the peaks and troughs in the graph.
-Thus, users should see the depth of the deepest point and other peaks. Mean depth
+So users should see the depth of the deepest point and other peaks. Mean depth
 is plotted as a grey line, indicating mean dive depth up to a particular moment during the dive.</p></div>
 <div class="admonitionblock">
 <table><tr>
@@ -2863,7 +2912,7 @@ is plotted as a grey line, indicating mean dive depth up to a particular moment
 </td>
 <td class="content">In some cases the dive profile does not fill the whole area of the <strong>Dive Profile</strong>
 panel. Clicking the <strong>Scale</strong> button in the toolbar on the left of the dive profile
-frequently increases the size of the dive profile to fill the area of the panel efficiently.</td>
+increases the size of the dive profile to fill the area of the panel.</td>
 </tr></table>
 </div>
 <div class="paragraph"><p><strong>Water temperature</strong> is displayed with its own blue line with temperature values
@@ -2871,8 +2920,8 @@ placed adjacent to significant changes.</p></div>
 <div class="paragraph"><p>The dive profile can include graphs of the <strong>partial pressures</strong>
 of O<sub>2</sub>, N<sub>2</sub>, and He during the dive (see figure above) as well as a calculated and dive computer
 reported deco ceilings (only visible for deep, long, or repetitive dives).
-Partial pressures of oxygen are indicated in green, those of nitrogen in black,
-and those of helium in dark red. These
+Partial pressures of oxygen are indicated in green, nitrogen in black,
+and helium in dark red. These
 partial pressure graphs are shown below the profile data.</p></div>
 <div class="admonitionblock">
 <table><tr>
@@ -2880,7 +2929,7 @@ partial pressure graphs are shown below the profile data.</p></div>
 <img src="images/icons/O2.jpg" alt="Note" />
 </td>
 <td class="content">Clicking this button allows display of the partial pressure of <strong>oxygen</strong> during the
-dive. This is depicted below the dive depth and water temperature graphs.</td>
+dive. This is shown below the dive depth and water temperature graphs.</td>
 </tr></table>
 </div>
 <div class="admonitionblock">
@@ -2897,18 +2946,18 @@ dive. This is depicted below the dive depth and water temperature graphs.</td>
 <img src="images/icons/He.jpg" alt="Note" />
 </td>
 <td class="content">Clicking this button allows display of the partial pressure of <strong>helium</strong> during the dive.
-This is only of importance to divers using Trimix, Helitrox or similar breathing gasses.</td>
+This is only important to divers using Trimix, Helitrox or similar breathing gasses.</td>
 </tr></table>
 </div>
 <div class="paragraph"><p>The <strong>air consumption</strong> graph displays the tank pressure and its change during the
 dive. The air consumption takes depth into account so that even when manually
-entering the start and end pressures the graph is not a straight line.
-Similarly to the depth graph the slope of the tank pressure gives the user information
+entering the start and end pressures the graph, is not a straight line.
+Like the depth graph, the slope of the tank pressure gives you information
 about the
 momentary SAC rate (Surface Air Consumption) when using an air integrated dive computer.
-Here the colour
+Here the color
 coding is not relative to some absolute values but relative to the average
-normalised air consumption during the dive. So areas that are red or orange
+normalized air consumption during the dive. So areas that are red or orange
 indicate
 times of increased normalized air consumption while dark green reflects times
 when the diver was using less gas than average.</p></div>
@@ -2925,14 +2974,11 @@ during the dive if the dive computer was attached to a heart rate sensor.</td>
 the scroll wheel / scroll gesture of your mouse or trackpad. By default
 <em>Subsurface</em> always shows a profile area large enough for at least 30 minutes
 and 30m
- (100ft) – this way short or shallow dives are intuitively recognizable;
-something
-that free divers clearly won’t care about.</p></div>
-<div class="imageblock" style="text-align:center;">
-<div class="content">
-<img src="images/MeasuringBar.png" alt="FIGURE: Measuring Bar" />
-</div>
-</div>
+ (100ft) – this way short or shallow dives are easily recognizable;
+something free divers won’t care about.
+<span class="image">
+<img src=":images/MeasuringBar.png" alt="FIGURE: Measuring Bar" />
+</span></p></div>
 <div class="admonitionblock">
 <table><tr>
 <td class="icon">
@@ -2941,7 +2987,7 @@ that free divers clearly won’t care about.</p></div>
 <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
+on the dive profile that you wish to measure. Information is then given
 in the horizontal white area underneath the
 two red dots.</td>
 </tr></table>
@@ -2954,36 +3000,34 @@ two red dots.</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,
+shows 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
+occur 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
+for example none of the Suunto dive computers make these 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>
+of the calculation) it’s 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
+It’s 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>
+at the beginning of this section). This is because <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
+even though the diver technically encountered a ceiling at depth, the dive still does
+not require a specific deco stop. This feature lets dive computers offer
 longer non-stop bottom times.</p></div>
 <div class="admonitionblock">
 <table><tr>
@@ -3033,8 +3077,8 @@ compartments following the Bühlmann model (<strong>B</strong> in figure below).
 <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
+<td class="content">By selecting this icon, the different cylinders used during a dive can be represented as a colored bar at the bottom
+of the <strong>Dive Profile</strong>. In general oxygen is represented by a green bar, nitrogen a yellow bar and helium 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>
@@ -3054,10 +3098,11 @@ Tissue pressures are calculated using the Bühlmann ZH-L16 algorithm and are dis
 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
+divers doing planned decompression diving, efficient rates of offgassing 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>
+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, at the position of the cursor on the dive profile.</td>
 </tr></table>
 </div>
 <div class="imageblock" style="text-align:center;">
@@ -3087,25 +3132,26 @@ during the dive. For more information external to this manual see:</p></div>
 <div class="sect2">
 <h3 id="_the_dive_profile_context_menu">6.5. The Dive Profile context menu</h3>
 <div class="paragraph"><p>The context menu for the Dive Profile is accessed by right-clicking while the
-mouse cursor is over the Dive Profile panel. The menu allows the creation of
-Bookmarks or Gas Change Event markers or manual CCR set-point changes other than the ones that might have been
-imported from a Dive Computer. Markers are placed against the depth profile line
-and with the time of the event set by where the mouse cursor was when the right
-mouse button was initially clicked to bring up the menu. Gas Change events
-involve a selection of which gas is being switched to, the list of choices being based on
-the available gases defined in the <strong>Equipment</strong> Tab. Set-point change
-events open a dialog allowing to choose the next set-point value. As
-in the planner, a set-point value of zero indicates the diver is
+mouse cursor is over the Dive Profile panel. The menu lets you create
+Bookmarks, Gas Change Event markers, or manual CCR set-point changes
+other than the ones that might have been
+imported from a Dive Computer. Markers are placed against the depth profile line,
+with the time of the event set by where the mouse cursor was when the right
+mouse button was first clicked to bring up the menu. Gas Change events
+involve a selection of which gas is being switched TO. The list of choices is based on
+the available gases defined in the <strong>Equipment</strong> Tab. Setpoint change
+events open a dialog letting you choose the next setpoint value. As
+in the planner, a setpoint value of zero shows the diver is
 breathing from an open circuit system while any non-zero value
-indicates the use of a closed circuit rebreather (CCR).
+shows the use of a closed circuit rebreather (CCR).
 By right-clicking while over
 an existing marker a menu appears, adding options to allow deletion of the
-marker or to allow all markers of that type to be hidden. Hidden events can be
+marker, or to allow all markers of that type to be hidden. Hidden events can be
 restored to view by selecting Unhide all events from the context menu.</p></div>
 </div>
 <div class="sect2">
 <h3 id="S_InfoBox">6.6. The <strong>Information Box</strong></h3>
-<div class="paragraph"><p>The Information box displays a large range of information pertaining to the dive
+<div class="paragraph"><p>The Information box displays a large range of information about the dive
 profile. Normally the Information Box is located to the top left of the <strong>Dive
 Profile</strong> panel. If the mouse points outside of the <strong>Dive Profile</strong> panel, then
 only the top line of the Information Box is visible (see left-hand part of
@@ -3118,12 +3164,12 @@ during subsequent dive analyses.</p></div>
 <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
+<div class="paragraph"><p>When 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
+the dive profile shown 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
+[arrow] in that image). Moving the cursor horizontally lets the Information Box 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
@@ -3133,7 +3179,7 @@ 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
+<div class="paragraph"><p>The user has control over the display of some statistics, shown as four
 buttons on the left of the profile panel. These are:</p></div>
 <div class="admonitionblock">
 <table><tr>
@@ -3146,7 +3192,7 @@ gas mixture used. MOD is dependent on the oxygen concentration in the breathing
 For air (21% oxygen) it is around 57 m if a maximum pO<sub>2</sub> of 1.4 is specified in the <strong>Preferences</strong> section
 (select <em>File</em> &#8594; Preferences &#8594; Graph_ and edit the text box <em>Max pO<sub>2</sub> when showing MOD</em>.
 Below the MOD there is a markedly increased
-risk of exposure to the dangers associated with oxygen toxicity.</td>
+risk of exposure to the dangers of oxygen toxicity.</td>
 </tr></table>
 </div>
 <div class="admonitionblock">
@@ -3154,13 +3200,16 @@ risk of exposure to the dangers associated with oxygen toxicity.</td>
 <td class="icon">
 <img src="images/icons/NDL.jpg" alt="Note" />
 </td>
-<td class="content">Clicking this button causes the Information Box to display the <strong>No-deco Limit (NDL)</strong> or the
+<td class="content">Clicking this button causes the Information Box to display either 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
+ascent ceiling appears). Once a diver 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>
+time. TTS is calculated assuming an ascent surface air consumption (SAC) for
+the gas currently used. Even if the profile contains several gas
+switches, TTS at a specific moment during the dive is calculated using the current gas.
+TTS longer than 2 hours is not accurately calculated and Subsurface only indicates <em>TTS &gt; 2h</em>.</td>
 </tr></table>
 </div>
 <div class="admonitionblock">
@@ -3169,12 +3218,12 @@ time.</td>
 <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
+SAC is an indication of the surface-normalized 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>
+independent of the depth of the dive, so the respiratory rates of different dives
+can be compared. The units for SAC is liters/min or cubic ft/min.</td>
 </tr></table>
 </div>
 <div class="admonitionblock">
@@ -3184,8 +3233,8 @@ can be compared. The units for SAC is litres/min or cub ft/min.</td>
 </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
+Narcotic Depth (END)</strong> for trimix dives. These are
+important to divers breathe 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
@@ -3200,9 +3249,9 @@ air diving at a depth equalling the END.</td>
 <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
+<div class="paragraph"><p>On the left of the <strong>Information Box</strong> is a vertical bar graph showing 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
+was inhaling <em>at a particular instant during the dive</em>. It is shown 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;">
@@ -3214,7 +3263,7 @@ meaning of the different parts of the Gas Pressure Bar Graph.</p></div>
 <li>
 <p>
 The light green area indicates the total gas, with the top margin of the light green
-  area indicating the total gas pressure inhaled by the diver and measured from the bottom
+  area showing 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>
@@ -3245,25 +3294,25 @@ The top black horizontal line indicates the gradient factor that applies to the
 </li>
 <li>
 <p>
-The bottom margin of the red area in the graph indicates the Bühlman-derived M-value, that is the
+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="paragraph"><p>These five values are shown on the left in the graph above. The way the Gas Pressure Bar Graph changes
+during a dive can be seen 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
+Graph <strong>A</strong> indicates the start of a dive with the 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.
+  time to respond to the descent, so their gas pressures are far below the equilibrium gas pressure.
 </p>
 </li>
 <li>
@@ -3276,9 +3325,9 @@ Graph <strong>C</strong> represents the pressures after 30 minutes at 30 m. The
 </li>
 <li>
 <p>
-Graph <strong>D</strong> shows the pressures after ascent to a depth of 4.5 meters. Since, during ascent, the total
+Graph <strong>D</strong> shows the pressures after ascent to a depth of 4.5 meters. Since during ascent the total
   inhaled gas pressure has decreased strongly from 4 bar to 1.45 bar, the pressures in the different tissue
-  compartments now exceed that of the total gas pressure and approaches the gradient factor value (i.e.
+  compartments now exceed that of the total gas pressure and approach the gradient factor value (i.e.
   the top black horizontal line). Further ascent will result in exceeding the gradient
   factor value (GFHigh), endangering the diver.
 </p>
@@ -3297,20 +3346,20 @@ Graph <strong>E</strong> indicates the situation after remaining at 4.5 meters f
 </div>
 </div>
 <div class="sect1">
-<h2 id="_organising_the_logbook_manipulating_groups_of_dives">7. Organising the logbook (Manipulating groups of dives)</h2>
+<h2 id="_organizing_the_logbook_manipulating_groups_of_dives">7. Organizing the logbook (Manipulating groups of dives)</h2>
 <div class="sectionbody">
 <div class="sect2">
 <h3 id="_the_dive_list_context_menu">7.1. The Dive List context menu</h3>
-<div class="paragraph"><p>Several actions on either a single dive or a group of dives can be performed using the Dive List
-Context Menu, found by selecting either a single dive or a group of dives and then right-clicking.</p></div>
+<div class="paragraph"><p>Several actions on either a single dive, or a group of dives, can be performed using the Dive List
+Context Menu.  It is found by selecting either a single dive or a group of dives and then right-clicking.</p></div>
 <div class="imageblock" style="text-align:center;">
 <div class="content">
 <img src="images/ContextMenu.jpg" alt="Figure: Context Menu" />
 </div>
 </div>
-<div class="paragraph"><p>The context menu is used in many manipulations described below.</p></div>
+<div class="paragraph"><p>The context menu is used in many functions 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>
+<h4 id="_customizing_the_columns_showed_in_the_strong_dive_list_strong_panel">7.1.1. Customizing the columns showed in the <strong>Dive List</strong> panel</h4>
 <div class="imageblock" style="text-align:center;">
 <div class="content">
 <img src="images/DiveListOptions.jpg" alt="Example: Dive list info options" />
@@ -3319,43 +3368,43 @@ Context Menu, found by selecting either a single dive or a group of dives and th
 <div class="paragraph"><p>The default information in the <strong>Dive List</strong> includes, for each dive, Dive_number, Date, Rating, Dive_depth,
 Dive_duration and Dive_location. This information can be controlled and changed by right-clicking on the
 header bar of the <strong>Dive List</strong>. For instance, a right-click on the <em>Date</em> header brings up a list of items
-that can be shown in the dive list (see above). Select an item to be shown in the <strong>Dive List</strong> or to be
-deleted from the dive list (reflected by the check symbols) and the list is immediately updated. Preferences for information
+that can be shown in the dive list (see above). Select an item to be shown in the <strong>Dive List</strong> or be
+deleted (reflected by the check symbols) and the list is immediately updated. Preferences for information
 shown in the <strong>Dive List</strong> are saved and used when <em>Subsurface</em> is re-opened.</p></div>
 </div>
 </div>
 <div class="sect2">
 <h3 id="S_Renumber">7.2. Renumbering the dives</h3>
 <div class="paragraph"><p>Dives are normally numbered incrementally from non-recent dives (low sequence
-numbers) to recent dives (having the highest sequence numbers). The numbering
-of the dives is not always consistent. For instance, when non-recent dives are
-added to the dive list the numbering does not automatically follow on because
+numbers) to recent dives (higher sequence numbers).  Numbering
+of dives is not always consistent. For instance, when non-recent dives are
+added, correct numbering does not automatically follow on because
 of the dives that are more recent in date/time than the newly-added dive with
-an older date/time. Therefore, one may sometimes need to renumber the dives.
-This is performed by selecting (from the Main Menu) <em>Log &#8594;  Renumber</em>. Users are
-given a choice with respect to the lowest sequence number to be used.
-Completing this operation results in new sequence numbers (based on date/time)
+an older date/time. So you may need to renumber the dives.
+Do this by selecting (from the Main Menu) <em>Log &#8594; Renumber</em>. Users are
+given a choice of the lowest sequence number to be used.
+This results in new sequence numbers (based on date/time)
 for the dives in the <strong>Dive List</strong> panel.</p></div>
-<div class="paragraph"><p>One can also renumber a few selected dives in the dive list. Select the dives that
+<div class="paragraph"><p>You can also renumber a few selected dives in the dive list. Select the dives that
 need renumbering. Right-click on the selected list and use the Dive List Context Menu
-to perform the renumbering. A popup window appears requiring the user to specify
-the starting number for the renumbering process.</p></div>
+to perform the renumbering. A popup window appears letting the user specify
+the starting number for the process.</p></div>
 </div>
 <div class="sect2">
 <h3 id="S_Group">7.3. Grouping dives into trips and manipulating trips</h3>
 <div class="paragraph"><p>For regular divers, the dive list can rapidly become very long. <em>Subsurface</em>
-can group dives into <em>trips</em>. It performs this by grouping dives that have
-date/times not separated in time by more than two days, thus creating
+can group dives into <em>trips</em>. It does this by grouping dives that have
+date/times not separated in time by more than two days, so creating
 a single heading for each diving trip represented in the dive log. Below is an
 ungrouped dive list (<strong>A</strong>, on the left) as well as the corresponding grouped dive
-list comprising five dive trips (<strong>B</strong>, on the right):</p></div>
+list of five dive trips (<strong>B</strong>, on the right):</p></div>
 <div class="imageblock" style="text-align:center;">
 <div class="content">
 <img src="images/Group2.jpg" alt="Figure: Grouping dives" />
 </div>
 </div>
 <div class="paragraph"><p>Grouping into trips allows a rapid way of accessing individual dives without
-having to scan a long lists of dives. In order to group the dives in a dive list,
+having to scan a long lists of dives. To group the dives in a dive list,
 (from the Main Menu) select <em>Log &#8594;  Autogroup</em>. The <strong>Dive List</strong> panel
 now shows only the titles for the trips.</p></div>
 <div class="sect3">
@@ -3363,9 +3412,9 @@ now shows only the titles for the trips.</p></div>
 <div class="paragraph"><p>Normally, in the dive list, minimal information is included in the trip title.
 More information about a trip can be added by selecting its trip title from
 the <strong>Dive List</strong>. This shows a <strong>Trip Notes</strong> tab in the <strong>Notes</strong> panel. Here
-one can add or edit information about the date/time, the trip location and any
-other general comments about the trip as a whole (e.g. the dive company that was
-dived with, the general weather and surface conditions during the trip, etc.).
+you can add or edit information about the date/time, the trip location and any
+other general comments about the trip as a whole (e.g. the dive
+company that was used, the general weather and surface conditions during the trip, etc.).
 After entering this
 information, select <strong>Save</strong> from the buttons at the top right
 of the <strong>Trip Notes</strong>
@@ -3374,14 +3423,14 @@ edited information.</p></div>
 </div>
 <div class="sect3">
 <h4 id="_viewing_the_dives_during_a_particular_trip">7.3.2. Viewing the dives during a particular trip</h4>
-<div class="paragraph"><p>Once the dives have been grouped into trips, users can expand one or more
+<div class="paragraph"><p>Once the dives have been grouped into trips, you can expand one or more
 trips by clicking the arrow-head on the left of each trip title. This expands
-the selected trip, revealing the individual dives performed during the trip.</p></div>
+the selected trip, revealing individual dives done during the trip.</p></div>
 </div>
 <div class="sect3">
 <h4 id="_collapsing_or_expanding_dive_information_for_different_trips">7.3.3. Collapsing or expanding dive information for different trips</h4>
 <div class="paragraph"><p>After selecting a particular trip in the dive list, the
-context menu allows several possibilities to expand or collapse dives
+context menu allows several options to expand or collapse dives
 within trips. This includes expanding all trips and collapsing all trips.</p></div>
 </div>
 <div class="sect3">
@@ -3392,12 +3441,12 @@ trip above. (Merge trip with trip below; Merge trip with trip above)</p></div>
 </div>
 <div class="sect3">
 <h4 id="_splitting_a_single_trip_into_more_than_one_trip">7.3.5. Splitting a single trip into more than one trip</h4>
-<div class="paragraph"><p>If a trip includes ten dives, the user can split this trip into two trips (trip 1:
+<div class="paragraph"><p>If a trip includes ten dives, you can split this trip into two trips (trip 1:
 top 4 dives; trip 2: bottom 6 dives) by selecting and right-clicking the top
-four dives. The resulting context menu allows the user to create a new trip by
+four dives. The resulting context menu lets the user create a new trip by
 choosing the option <strong>Create new trip above</strong>. The top four dives are then
 grouped
-into a separate trip. The figures below shows the selection and context menu
+into a separate trip. The figures below show the selection and context menu
 on the left (A) and
 the completed action on the right (B):</p></div>
 <div class="imageblock" style="text-align:center;">
@@ -3412,14 +3461,14 @@ the completed action on the right (B):</p></div>
 <div class="sect3">
 <h4 id="_delete_a_dive_from_the_dive_log">7.4.1. Delete a dive from the dive log</h4>
 <div class="paragraph"><p>Dives can be permanently deleted from the dive log by selecting and
-right-clicking them to bring up the context menu, and then selecting <strong>Delete
+right-clicking them to bring up the context menu, then selecting <strong>Delete
 dive(s)</strong>. Typically this would apply to a case where a user wishes to delete
 workshop
 calibration dives of the dive computer or dives of extremely short duration.</p></div>
 </div>
 <div class="sect3">
 <h4 id="_unlink_a_dive_from_a_trip">7.4.2. Unlink a dive from a trip</h4>
-<div class="paragraph"><p>Users can unlink dives from the trip to which they belong. In order to do this,
+<div class="paragraph"><p>You can unlink dives from the trip to which they belong. To do this,
 select and right-click
 the relevant dives to bring up the context menu. Then select the option <strong>Remove dive(s)
 from trip</strong>. The dive(s) now appear immediately above or below the trip to
@@ -3433,21 +3482,21 @@ the dive(s) to bring up the context menu, and then select <strong>Create new tri
 </div>
 <div class="sect3">
 <h4 id="_shift_the_start_time_of_dive_s">7.4.4. Shift the start time of dive(s)</h4>
-<div class="paragraph"><p>Sometimes it is necessary to adjust the start time of a dive. This may apply to
-situations where dives are performed in different time zones or when the dive
-computer has an erroneous time. In order to do this, select and right-click
+<div class="paragraph"><p>Sometimes it’s necessary to adjust the start time of a dive. This may apply to
+situations where dives are done in different time zones or when the dive
+computer has a wrong time. To do this, select and right-click
 the dive(s) to be
-adjusted. This action brings up the context menu on which the <strong>Shift times</strong>
-option should be selected. User must then specify the
+adjusted. This brings up the context menu on which the <strong>Shift times</strong>
+option should be selected. You must then specify the
 time
 (in hours and minutes) by which the dives should be adjusted and click on the
-option indicating whether the time adjustment should be ealier or later.</p></div>
+option of whether the time adjustment should be earlier or later.</p></div>
 </div>
 <div class="sect3">
 <h4 id="_merge_dives_into_a_single_dive">7.4.5. Merge dives into a single dive</h4>
-<div class="paragraph"><p>Sometimes a dive is briefly interrupted, e.g. if a diver returns to the surface
-for a few minutes, resulting in two or more dives being recorded by the dive
-computer and appearing as different dives in the <strong>Dive List</strong> panel. Users can
+<div class="paragraph"><p>Sometimes a dive is briefly interrupted, for example, if a diver returns to the surface
+for a few minutes. That results in two or more dives being recorded by the dive
+computer and appearing as different dives in the <strong>Dive List</strong> panel. You can
 merge these dives onto a single dive by selecting the appropriate dives,
 right-clicking them to bring up the context menu and then selecting <strong>Merge selected
 dives</strong>. It may be necessary to edit the dive information in the <strong>Notes</strong>
@@ -3469,34 +3518,34 @@ To do this after performing any of these actions, from the <strong>Main Menu</st
 </div>
 <div class="sect2">
 <h3 id="S_Filter">7.5. Filtering the dive list</h3>
-<div class="paragraph"><p>The dives in the <strong>Dive List</strong> panel can be filtered, that is, one can select only some
+<div class="paragraph"><p>The dives in the <strong>Dive List</strong> panel can be filtered, so you can select only some
 of the dives based on their attributes, e.g. dive tags, dive site, dive master, buddy or protective
-clothing. For instance, filtering allows one to list the deep dives at a particular
+clothing. For instance, filtering lets you list the deep dives at a particular
 dive site, or otherwise the cave dives with a particular buddy.</p></div>
 <div class="paragraph"><p>To open the filter, select <em>Log &#8594;  Filter divelist</em> from the main menu. This opens the
 <em>Filter Panel</em> at the top of the <em>Subsurface</em> window. Three icons are located at the top
 right hand of the filter panel (see image below). The <em>Filter Panel</em> can be reset
 (i.e. all current filters cleared) by selecting the <strong>yellow angled arrow</strong>. The <em>Filter Panel</em> may also be
-minimised by selecting the <strong>green up-arrow". When minimised, only these three icons are shown.
-The panel can be maximised by clicking the icon that minimised the panel. The filter may also be
+minimized by selecting the <strong>green up-arrow". When minimized, only these three icons are shown.
+The panel can be maximized by clicking the same icon that minimized it. The filter may also be
 reset and closed by selecting the *red button</strong> with the white cross.</p></div>
 <div class="imageblock" style="text-align:center;">
 <div class="content">
 <img src="images/Filterpanel.jpg" alt="Figure: Filter panel" />
 </div>
 </div>
-<div class="paragraph"><p>Four filter criteria may be used to filter the dive list: dive tags, person (buddy / dive master), dive site
-and dive suit, each of which is represented by a check list with check boxes. Above
-each check list is a second-level filter tool, allowing the listing of only some of
-the attributes within that check list. For instance, typing "<em>ca</em>" in the filter
-textbox above the tags check list results in the tags check list being reduced
-to "<em>cave</em>" and "<em>cavern</em>". Filtering of the check list enables the rapid finding
-of search terms for filtering the dive list.</p></div>
+<div class="paragraph"><p>Four filter criteria may be used to filter the dive list: dive tags, person (buddy / divemaster), dive site
+and dive suit.  Each of these is represented by a check list with check boxes. Above
+each check list is a second-level filter tool, allowing the listing of only some
+attributes within that check list. For instance, typing "<em>ca</em>" in the filter
+text box above the tags check list, results in the list being reduced
+to "<em>cave</em>" and "<em>cavern</em>". Filtering the check list helps to rapidly find
+search terms for filtering the dive list.</p></div>
 <div class="paragraph"><p>To activate filtering of the dive list, check at least one check box in one of
 the four check lists. The dive list is then shortened to include
 only the dives that pertain to the criteria specified in the check lists.
-The four check lists work as a filter with <em>AND</em> operators, Subsurface
-filters therefore  for <em>cave</em> as a tag AND <em>Joe Smith</em> as a buddy; but the
+The four check lists work as a filter with <em>AND</em> operators. Subsurface
+filters therefore  for <em>cave</em> as a tag AND <em>Joe Smith</em> as a buddy. But the
 filters within a category are inclusive - filtering for <em>cave</em> and <em>boat</em>
 shows those dives that have either one OR both of these tags.</p></div>
 </div>
@@ -3505,7 +3554,7 @@ shows those dives that have either one OR both of these tags.</p></div>
 <div class="sect1">
 <h2 id="S_ExportLog">8. Exporting the dive log or parts of the dive log</h2>
 <div class="sectionbody">
-<div class="paragraph"><p>There are two routes for the export of dive information from Subsurface:</p></div>
+<div class="paragraph"><p>There are two ways to export dive information from Subsurface:</p></div>
 <div class="ulist"><ul>
 <li>
 <p>
@@ -3522,34 +3571,33 @@ Export dive information to <em>Facebook</em>
 <h3 id="S_facebook">8.1. Exporting dive information to <em>Facebook</em></h3>
 <div class="paragraph"><p>Export of dives to <em>Facebook</em> is handled differently from other types of export because
 a connection to <em>Facebook</em> is required, needing a <em>Facebook</em> userID and password.
-If, from the <strong>Main Menu</strong>, one selects <em>File &#8594;  Preferences &#8594;  Facebook</em>, a login screen is presented
+If, from the <strong>Main Menu</strong>, you select <em>File &#8594;  Preferences &#8594; Facebook</em>, a login screen comes up.
 (image <strong>A</strong> to the left, below).  Provide a <em>Facebook</em> userID and password.
-Once a successful login to <em>Facebook</em> has been achieved, the panel
-in image <strong>B</strong>, below is presented, including a <em>Disconnect from Facebook</em> button to close the
+Once logged into to <em>Facebook</em> , the panel
+in image <strong>B</strong>, below is shown, including a <em>Disconnect from Facebook</em> button to close the
 <em>Facebook</em> connection.</p></div>
 <div class="imageblock" style="text-align:center;">
 <div class="content">
 <img src="images/facebook1_f20.jpg" alt="Figure: Facebook login" />
 </div>
 </div>
-<div class="paragraph"><p>From the <em>Subsurface</em> window it is easy to determine whether <em>Subsurface</em> has a valid connection to <em>Facebook</em>
+<div class="paragraph"><p>From the <em>Subsurface</em> window it’s easy to determine whether <em>Subsurface</em> has a valid connection to <em>Facebook</em>
 From the <strong>Main Menu</strong>, select <em>Share on &#8594; Facebook</em> (image <strong>A</strong>, below). Normally, the <em>Facebook</em> option is greyed out. But
-if there is a connection to <em>Facebook</em>, this option is active (i.e. in black colour and can be selected).</p></div>
-<div class="paragraph"><p>Having established a login to <em>Facebook</em>, transfer of a dive profile to one&#8217;s <em>Facebook</em> timeline is easy.
-Ensure that the dive to be transfered to the timeline is depicted in the <em>Subsurface</em> <strong>Dive Profile</strong> panel. If, from the <strong>Main Menu</strong>, one selects <em>Share on &#8594; Facebook</em> (see image <strong>A</strong> below), a dialogue is shown, determining the amount of additional information transferred
-with the dive profile (image <strong>B</strong>, below). In order to transfer a dive profile to <em>Facebook</em>, the name of a
-<em>Facebook</em> album needs to be provided. The checkboxes on the lefthand side allow one to determine how much
+if there is a connection to <em>Facebook</em>, this option is active (i.e. in black color and can be selected).</p></div>
+<div class="paragraph"><p>Having established a login to <em>Facebook</em>, transferring a dive profileto a <em>Facebook</em> timeline is easy.
+Be sure the dive to be transferred to the timeline is shown in the <em>Subsurface</em> <strong>Dive Profile</strong> panel. If, from the <strong>Main Menu</strong>, you
+select <em>Share on &#8594; Facebook</em> (see image <strong>A</strong> below), a dialogue box is shown, determining the amount of additional information transferred along
+with the dive profile (image <strong>B</strong>, below). To transfer a dive profile to <em>Facebook</em>, the name of a
+<em>Facebook</em> album is needed. The checkboxes on the left hand side let you decide how much
 additional information should be transferred with the dive profile. This information is shown in the text box
-on the right hand side of the panel (image <strong>B</strong>, below). One can easily edit the message that will be posted
-with the dive profile. Having specified the additional information and verified the text, select
-the <em>OK</em> button that triggers the transfer to <em>Facebook</em>. After a while, an acknowledgement dialogue appears,
-indicating successful transfer to <em>Facebook</em>.</p></div>
-<div class="paragraph"><p>Both the album created and the post to one&#8217;s timeline will be marked as
-private. In order for friends to be able to see the post,
-change its permissions from a regular Facebook login either in a browser
-or a Facebook app. While this is an extra step
-this is the better solution to avoid having unwanted posts in one&#8217;s public
-timeline.</p></div>
+on the right hand side of the panel (image <strong>B</strong>, below). You can easily edit the message that will be posted
+with the dive profile.  After specifying the additional information and verifying the text, select
+the <em>OK</em> button that triggers the transfer to <em>Facebook</em>. After the transfer
+is done, an acknowledgement dialogue appears, indicating it was successful.</p></div>
+<div class="paragraph"><p>Both the album created and the post to your timeline will be marked as
+private. In order for friends to be able to see it,
+change its permissions from a regular Facebook login either in a
+browser or a Facebook app.</p></div>
 <div class="imageblock" style="text-align:center;">
 <div class="content">
 <img src="images/facebook2_f20.jpg" alt="Figure: Facebook login" />
@@ -3559,8 +3607,8 @@ timeline.</p></div>
 the Main Menu, and clicking the appropriate button on the Facebook Preferences panel.</p></div>
 </div>
 <div class="sect2">
-<h3 id="S_Export_other">8.2. Export dive information  to other destinations or formats</h3>
-<div class="paragraph"><p>For non-<em>Facebook exports</em>, the export function can be reached by selecting <em>File &#8594;  Export</em>, which brings up
+<h3 id="S_Export_other">8.2. Export dive information to other destinations or formats</h3>
+<div class="paragraph"><p>For non-<em>Facebook exports</em>, the export function can be found by selecting <em>File &#8594;  Export</em>, which brings up
 the Export dialog. This dialog always gives two options: save ALL dives, or save only
 the dives selected in <strong>Dive List</strong> panel of <em>Subsurface</em>. Click the appropriate
 radio button (see images below).</p></div>
@@ -3586,14 +3634,14 @@ Universal Dive Data Format (<em>UDDF</em>). Refer to <em>http://uddf.org</em> fo
 <li>
 <p>
 <em>Divelogs.de</em>, an Internet-based dive log repository. In order to upload to <em>Divelogs.de</em>,
-  one needs a user-ID as well as a password for <em>Divelogs.de</em>. Log into <em>http://en.divelogs.de</em>
-  and subscribe to this service in order to upload dive log data from <em>Subsurface</em>.
+  you need a user-ID as well as a password for <em>Divelogs.de</em>. Log into <em>http://en.divelogs.de</em>
+  and subscribe to this service to upload dive log data from <em>Subsurface</em>.
 </p>
 </li>
 <li>
 <p>
-<em>DiveShare</em> is also a dive log repository on the Internet focusing on the recreational
-  dives. In order to upload dives one has to provide a used ID, so registration with
+<em>DiveShare</em> is also a dive log repository on the Internet focusing on recreational
+  dives. To upload dives, you need a user ID, so registration with
   <em>http://scubadiveshare.com</em> is required.
 </p>
 </li>
@@ -3621,16 +3669,16 @@ Universal Dive Data Format (<em>UDDF</em>). Refer to <em>http://uddf.org</em> fo
   pressures and MOD. The HTML export contains a search
   option to search the dive log. HTML export is specified on the second tab of the
   Export dialog (image <strong>B</strong> above). A typical use of this option is to export all one&#8217;s
-  dives to a smartphone or a tablet where it would serve as a very portable record
-  of dives useful for dive companies that wish to verify the dive history of a diver,
-  often doing away with the need to carry one&#8217;s original logbook with one
+  dives to a smartphone or a tablet where it would serve as a  portable record
+  of dives. That is useful for dive companies that wish to verify the dive history of a diver,
+  often doing away with the need to carry an original logbook
   when doing dives with dive companies.
 </p>
 </li>
 <li>
 <p>
 <em>Worldmap</em> format, an HTML file with a world map upon which each dive and
-  some information about it are indicated. This map is not editable. If one selects any
+  some information about it are indicated. This map is not editable. If you select any
   of the dive sites on the map, a summary of the dive is available in text, as shown
   in the image below.
 </p>
@@ -3645,9 +3693,9 @@ Universal Dive Data Format (<em>UDDF</em>). Refer to <em>http://uddf.org</em> fo
 <li>
 <p>
 <em>Image depths</em>, which creates a text file that contains the file names of all
-  photos or images  attached
-  to any of the selected dives in the <em>Dive List</em>, together with the depth under water where
-  of each of those photos were taken.
+  photos or images attached
+  to any of the selected dives in the <em>Dive List</em>, together with the depth underwater where
+  of each of those photos was taken.
 </p>
 </li>
 <li>
@@ -3683,7 +3731,7 @@ Under <em>Style Options</em> some style-related options are available like font
 </p>
 </li>
 </ul></div>
-<div class="paragraph"><p>Export to other formats can be achieved through third party facilities, for
+<div class="paragraph"><p>Export to other formats can be done through third party facilities, for
 instance <em>www.divelogs.de</em>.</p></div>
 </div>
 </div>
@@ -3692,18 +3740,17 @@ instance <em>www.divelogs.de</em>.</p></div>
 <h2 id="S_Cloud_access">9. Keeping a <em>Subsurface</em> dive log in the Cloud</h2>
 <div class="sectionbody">
 <div class="paragraph"><p>For each diver, dive log information is highly important. Not only is it a record
-of diving activities for one&#8217;s own pleasure, but it is important information required
-for admission to further training courses or (sometimes) even diving sites. The
-security of the dive log is therefore critical. In order to have a dive log that is
+of diving activities for one&#8217;s own pleasure, but it’s important information required
+for admission to training courses or sometimes even diving sites. The
+security of the dive log is critical. To have a dive log that is
 resistant to failure of a home computer hard drive, loss or theft of equipment, the
-Cloud is an obvious solution. This also has the added benefit that one can access one&#8217;s dive
-log from anywhere in the world without having to carry it with oneself. For this
-reason, facilities such as <em>divelogs.de</em> and <em>Diving Log</em> offer to store
+Cloud is an obvious solution. This also has the added benefit that you can access your dive
+log from anywhere in the world. For this reason, facilities such as <em>divelogs.de</em> and <em>Diving Log</em> offer to store
 dive log information on the Internet.</p></div>
 <div class="paragraph"><p><em>Subsurface</em> includes access to a transparently integrated cloud storage
 back end that is available to all Subsurface users. Storing and retrieving a dive log
 from the cloud is no more difficult than accessing the dives on the local hard disk.
-The only requirement is that one should first register as a user on the cloud.
+The only requirement is that you should first register as a user on the cloud.
 To use <em>Subsurface cloud storage</em> , follow these steps:</p></div>
 <div class="sect2">
 <h3 id="_create_a_cloud_storage_account">9.1. Create a cloud storage account</h3>
@@ -3754,25 +3801,25 @@ will be marked as verified and the <em>Subsurface cloud storage</em> service is
 <div class="ulist"><ul>
 <li>
 <p>
-Once the cloud storage has been initialised, two new items appear in the
+Once the cloud storage has been initialized, two new items appear in the
    <em>File</em> menu of the main menu system: <em>Open cloud storage</em> and <em>Save to cloud storage</em>.
-These options allow the user to load and save data to the <em>Subsurface
+These options let you load and save data to the <em>Subsurface
 cloud storage</em> server.
 </p>
 </li>
 <li>
 <p>
-In the <em>Defaults Preferences</em> tab, one can select to use the <em>Subsurface cloud
-storage</em> data as one&#8217;s default data file by checking the check box marked <em>Cloud storage default file</em>.
- This means that the data from
-the <em>Subsurface cloud storage</em> is loaded when <em>Subsurface</em> starts ans saved there when one closes <em>Subsurface</em>.
+In the <em>Defaults Preferences</em> tab, you can select to use the <em>Subsurface cloud
+storage</em> data as the default data file by checking the box marked <em>Cloud storage default file</em>.
+ This means the data from
+the <em>Subsurface cloud storage</em> is loaded when <em>Subsurface</em> starts and saved there when <em>Subsurface</em> closes.
 </p>
 </li>
 <li>
 <p>
 <em>Subsurface</em> keeps a local copy of the data and the cloud facility remains fully
-functional even if used while disconnected to the Internet. <em>Subsurface</em> simply synchronises the
-data with the cloud server the next time ithe program is used while the computer is
+functional even if used while disconnected to the Internet. <em>Subsurface</em> simply synchronizes the
+data with the cloud server the next time the program is used while the computer is
 connected to the Internet.
 </p>
 </li>
@@ -3781,30 +3828,30 @@ connected to the Internet.
 <div class="sect2">
 <h3 id="S_Cloud_storage">9.3. Web access to <em>Subsurface cloud storage</em></h3>
 <div class="paragraph"><p>One of the nice side benefits of using <em>Subsurface cloud storage</em> is that
-one can also access one&#8217;s dive data from any web browser. Simply open
+you can also access your dive data from any web browser. Simply open
 <a href="https://cloud.subsurface-divelog.org"><em>https://cloud.subsurface-divelog.org</em></a>,
 log in with the same email and password, and you can see an HTML export of
-the last dive data that was synced to the <em>Subsurface cloud storage</em>. The dive information
-that is shown is only the contents of the recorded dive logs, NOT the calculated values
+the last dive data that was synced to <em>Subsurface cloud storage</em>. The dive information
+shown is only the contents of the recorded dive logs, NOT the calculated values
 shown in the <strong>Profile</strong> panel,
 including some cylinder pressures, deco ceilings and O<sub>2</sub>/He/N<sub>2</sub> partial pressures.</p></div>
 </div>
 <div class="sect2">
 <h3 id="_other_cloud_services">9.4. Other cloud services</h3>
-<div class="paragraph"><p>If one prefers not to use the integrated cloud storage of dive logs (and
-don&#8217;t need the web access), it is also simple to store
+<div class="paragraph"><p>If you prefers not to use the integrated cloud storage of dive logs (and
+don&#8217;t need the web access), it’s simple to store
 dive logs in the cloud using several of the existing facilities on the
 Internet.
 For instance
 <a href="http://www.dropbox.com/"><em>Dropbox</em></a>
 offers a free application that allows
-files on the Dropbox servers to be seen as a local folder on one&#8217;s desktop computer.</p></div>
+files on the Dropbox servers to be seen as a local folder on a desktop computer.</p></div>
 <div class="imageblock" style="text-align:center;">
 <div class="content">
 <img src="images/Cloud.jpg" alt="FIGURE: Dropbox folder" />
 </div>
 </div>
-<div class="paragraph"><p>The <em>Dropbox</em> program creates a copy of the <em>Dropbox</em> Internet Cloud content on one&#8217;s
+<div class="paragraph"><p>The <em>Dropbox</em> program creates a copy of the <em>Dropbox</em> Internet Cloud content on your
 desktop computer. When the computer is connected to the Internet, the Internet
 content is automatically updated. Therefore both the <em>Open</em> and <em>Save</em> of dive logs are done
 using the local copy of the dive log in the local <em>Dropbox</em> folder, so there&#8217;s no need
@@ -3812,12 +3859,12 @@ for a direct internet connection. If the local copy is modified, e.g. by adding
 the remote copy in the <em>Dropbox</em> server in the Cloud will be automatically updated whenever
 Internet access is available.</p></div>
 <div class="paragraph"><p>In this way a dive log in
-one&#8217;s <em>Dropbox</em> folder can be accessed seamlessly from the Internet and can
-be accessed from any place with Internet access. Currently there are no costs
+your <em>Dropbox</em> folder can be accessed seamlessly from the Internet and can
+be accessed anywhere with Internet access. Currently there are no costs
 involved for this service. Dropbox (Windows, Mac
 and Linux) can be installed by accessing the
 <a href="http://www.dropbox.com/install"><em>Install Page on the Dropbox website</em></a>
-. Alternatively one can use <em>Dropbox</em> as a mechanism to backup one&#8217;s dive log. To
+. Alternatively you can use <em>Dropbox</em> as a way back up your dive log. To
 Store a dive log on <em>Dropbox</em>, select <em>File &#8594;  Save as</em> from the <em>Subsurface</em> main menu,
 navigate to the <em>Dropbox</em> folder and select the <em>Save</em> button. To access the dive log
 in <em>Dropbox</em>, select <em>File &#8594;  Open Logbook</em> from the <em>Subsurface</em>
@@ -3831,25 +3878,25 @@ process could be used for the Cloud-based storage of dive logs.</p></div>
 <div class="sect1">
 <h2 id="S_PrintDivelog">10. Printing a dive log</h2>
 <div class="sectionbody">
-<div class="paragraph"><p><em>Subsurface</em> provides a simple and flexible interface to print a whole dive log or only a few selected dives.
+<div class="paragraph"><p><em>Subsurface</em> provides a simple and flexible way to print a whole dive log or only a few selected dives.
   Pre-installed templates or a custom written template can be used to choose where the data are fitted into the page.</p></div>
-<div class="paragraph"><p>Before printing, two decisions are required:</p></div>
+<div class="paragraph"><p>Some decisions need to be made before printing:</p></div>
 <div class="ulist"><ul>
 <li>
 <p>
-Should the whole dive log be printed or only part of it? If only part of the
-  dive log is required, then select the required dives from the <strong>Dive List</strong> panel.
+Should the whole dive log be printed or only part of it? If only part
+  is required, select the required dives from the <strong>Dive List</strong> panel.
 </p>
 </li>
 <li>
 <p>
-If the dive profiles needs printing, what gas partial pressure information should be shown? Select
+If the dive profiles are printed, what gas partial pressure information should be shown? Select
   the appropriate toggle-buttons on the button bar to the left of the <strong>Dive Profile</strong> panel.
 </p>
 </li>
 </ul></div>
-<div class="paragraph"><p>If <em>File &#8594;  Print</em> is selected from the Main menu, the the dialogue below (image <strong>A</strong>) appears. Three
-specifications are needed to achieve the desired information and page layout:</p></div>
+<div class="paragraph"><p>If <em>File &#8594;  Print</em> is selected from the Main menu, the dialogue below (image <strong>A</strong>) appears. Three
+specifications are needed to get the desired information and page layout:</p></div>
 <div class="imageblock" style="text-align:center;">
 <div class="content">
 <img src="images/Print1_f22.jpg" alt="FIGURE: Print dialogue" />
@@ -3880,23 +3927,23 @@ Under <em>Print options</em> select:
 <div class="ulist"><ul>
 <li>
 <p>
-Printing only the dives selected from the dive list prior to
+Printing only the dives selected from the dive list before
   activating the print dialogue by checking the box <em>Print only
-  selected dives</em>. If this check box is <strong>not</strong> checked all dives in
+  selected dives</em>. If this check box is <strong>not</strong> checked ALL dives in
   the <strong>Dive List</strong> panel are printed.
 </p>
 </li>
 <li>
 <p>
-Printing in colour, achieved by checking the box with <em>Print in colour</em>. If this check box
-  is not checked, printing is in monochrome (grey scale).
+Printing in color, done by checking the box with _Print in color. If this check box
+  is not checked, printing is in black and white.
 </p>
 </li>
 </ul></div>
 </li>
 <li>
 <p>
-Under <em>Template</em> select a template to be used as the page layout. There are several templates
+Under <em>Template</em> select a template to be used as the page layout. There are several choices.
 (see image <strong>B</strong>, above).
 </p>
 <div class="ulist"><ul>
@@ -3950,12 +3997,12 @@ Under <em>Template</em> select a template to be used as the page layout. There a
 </p>
 </li>
 </ul></div>
-<div class="paragraph"><p>Users can <em>Preview</em> the printed page by selecting the <em>Preview</em> button on the
-dialogue (see image <strong>A</strong> at the start of this section). After preview, changes to
-the options in the print dialogue can be made, resulting in a layout that fits personal taste.</p></div>
+<div class="paragraph"><p>You can <em>Preview</em> the printed page by selecting the <em>Preview</em> button on the
+dialogue (see image <strong>A</strong> at the start of this section). After preview, you can change
+the options in the print dialogue, so the layout fits personal taste.</p></div>
 <div class="paragraph"><p>Next, select the <em>Print</em> button (see image <strong>A</strong> at the start of this section). This activates the regular print
-dialogue used by the user operating system,
-allowing one to choose a printer and to set its properties (see image below):</p></div>
+dialogue used by the operating system,
+letting you choose a printer and set its properties (see image below):</p></div>
 <div class="imageblock" style="text-align:center;">
 <div class="content">
 <img src="images/Print_print_f22.jpg" alt="FIGURE: Print dialog" />
@@ -3972,19 +4019,21 @@ Below is a (rather small) example of the output for one particular page.</p></di
 <div class="sect2">
 <h3 id="_writing_a_custom_print_template_advanced">10.1. Writing a custom print template (advanced)</h3>
 <div class="paragraph"><p>Writing a custom template is an effective way to produce highly customized printouts. Subsurface uses HTML templates
-to render printing. One can create a template, export a new template, import an existing template and delete an existing template by using the appropriate buttons under the <em>Template</em> dropdown list in the print dialogue. See <a href="#S_APPENDIX_E">APPENDIX E</a> for information on how to write or modify a template.</p></div>
+to render printing. You can create a template, export a new template, import an existing template and delete an existing template by using
+the appropriate buttons under the <em>Template</em> dropdown list in the print dialogue. See <a href="#S_APPENDIX_E">APPENDIX E</a> for information on how
+to write or modify a template.</p></div>
 </div>
 </div>
 </div>
 <div class="sect1">
 <h2 id="S_Configure">11. Configuring a dive computer</h2>
 <div class="sectionbody">
-<div class="paragraph"><p><em>Subsurface</em> enables one to configure a dive computer. Currently the Heinrichs-Weikamp (OSTC 2, OSTC 3) and
+<div class="paragraph"><p><em>Subsurface</em> lets you configure a dive computer. Currently the Heinrichs-Weikamp (OSTC 2, OSTC 3) and
 Suunto Vyper (Stinger, Mosquito, D3, Vyper, Vytec,
 Cobra, Gekko and Zoop) family of dive computers are supported. A large number of settings of these dive computers
-can be read and changed to different values. As a first step, ensure that the appropriate hardware driver
-is installed for the dive computer (also required for downloading dives) and that the device name of the dive computer is known.
-See <a href="#_appendix_a_operating_system_specific_information_for_importing_dive_information_from_a_dive_computer">APPENDIX A</a> for information on how to do this.</p></div>
+can be read and changed to different values. To begin, be sure the appropriate hardware driver
+is installed for the dive computer (also required for downloading dives) and the device name of the dive computer is known.
+See <a href="#_appendix_a_operating_system_specific_information_for_importing_dive _information_from_a_dive_computer">APPENDIX A</a> for information on how to do this.</p></div>
 <div class="paragraph"><p>Once the dive computer is connected to the <em>Subsurface</em> computer, select <em>File &#8594;  Configure dive
 computer</em> from the <em>Main Menu</em>. Provide the appropriate device name in the text box at the
 top of the configuration panel and select the appropriate dive
@@ -3994,7 +4043,7 @@ computer model from the panel on the left-hand (see image below).</p></div>
 <img src="images/Configure_dc_f20.jpg" alt="FIGURE: Configure dive computer" />
 </div>
 </div>
-<div class="paragraph"><p>Using the appropriate buttons on the configuration panel, the following actions can be performed:</p></div>
+<div class="paragraph"><p>Using the appropriate buttons on the configuration panel, the following actions can be done:</p></div>
 <div class="ulist"><ul>
 <li>
 <p>
@@ -4033,11 +4082,10 @@ computer model from the panel on the left-hand (see image below).</p></div>
 <h2 id="S_Preferences">12. Setting user <em>Preferences</em> for <em>Subsurface</em></h2>
 <div class="sectionbody">
 <div class="paragraph"><p>There are several user-definable settings within <em>Subsurface</em>, found by selecting
-<em>File &#8594;  Preferences</em>. The settings are performed in
-seven groups: <strong>Defaults</strong>, <strong>Units</strong>, <strong>Graph</strong>, <strong>Language</strong> and <strong>Network</strong>, <strong>Facebook</strong> and <strong>Georeference</strong>,
-all of which
-operate on the same principles: the user must specify the settings that are to be changed, then
-these changes are saved using the <strong>Apply</strong> button. After applying all the new settings users can then
+<em>File &#8594;  Preferences</em>. The settings are in
+seven groups: <strong>Defaults</strong>, <strong>Units</strong>, <strong>Graph</strong>, <strong>Language</strong> and <strong>Network</strong>, <strong>Facebook</strong> and <strong>Georeference</strong>.
+All operate on the same principles: the user must specify settings that are to be changed, then
+save them using the <strong>Apply</strong> button. After applying all the new settings users can then
 leave the settings panel by selecting <strong>OK</strong>. If <strong>Discard</strong> is selected, changes to the preferences
 are not saved.</p></div>
 <div class="sect2">
@@ -4051,14 +4099,14 @@ are not saved.</p></div>
 <div class="ulist"><ul>
 <li>
 <p>
-<strong>Lists and tables</strong>: Here one can specify the font type and font size of the
-     <strong>Dive Table</strong> panel. By decreasing the font size of the <strong>Dive Table</strong>, users can see more dives on a screen.
+<strong>Lists and tables</strong>: Here you can specify the font type and font size of the
+     <strong>Dive Table</strong> panel: By decreasing the font size of the <strong>Dive Table</strong>, you can see more dives on a screen.
 </p>
 </li>
 <li>
 <p>
-<strong>Dives</strong>: For the <em>Default Dive File</em> one needs to specify the directory and
-     file name of one&#8217;s
+<strong>Dives</strong>: For the <em>Default Dive File</em> you need to specify the directory and
+     file name of your
      electronic dive log book. This is a file with filename extension of either <em>.xml</em> or <em>.ssrf</em>. When
      launched, <em>Subsurface</em> will automatically load the specified dive log book. There are three options:
 </p>
@@ -4077,7 +4125,7 @@ are not saved.</p></div>
 <li>
 <p>
 <em>Cloud storage default file</em>: When checked, <em>Subsurface automatically loads the dive log from the cloud
-       device that was initialised using the <strong>Preferences</strong> _Network</em> tab (see below).
+       device that was initialized using the <strong>Preferences</strong> _Network</em> tab (see below).
 </p>
 </li>
 </ul></div>
@@ -4122,12 +4170,12 @@ are not saved.</p></div>
 <img src="images/Pref2_f20.jpg" alt="FIGURE: Preferences Units page" />
 </div>
 </div>
-<div class="paragraph"><p>Here users can choose between metric and imperial units of depth, pressure,
+<div class="paragraph"><p>Here you can choose between metric and imperial units of depth, pressure,
 volume, temperature and mass. By selecting the Metric or Imperial radio button
-at the top, one can specify that all units are in the chosen measurement system.
-Alternatively, if one selects the <strong>Personalise</strong> radio button, units can be selected
-independently, with some units in the metric system and others in imperial.</p></div>
-<div class="paragraph"><p>Irrespective
+at the top, you can specify that all units are in the chosen measurement system.
+Alternatively, if you select the <strong>Personalize</strong> radio button, units can be selected
+independently, with some in the metric system and others in imperial.</p></div>
+<div class="paragraph"><p>Regardless
 of the above settings, dive time measurements can be either in seconds or minutes.
 Choose the appropriate option. GPS coordinates can be represented either as
 traditional coordinates (degrees, minutes, seconds) or as decimal degrees
@@ -4144,17 +4192,17 @@ Choose the appropriate option.</p></div>
 <div class="ulist"><ul>
 <li>
 <p>
-<strong>Show</strong>: Here users can specify the amount of information shown as part of
+<strong>Show</strong>: Here you can specify the amount of information shown as part of
   the dive profile:
 </p>
 <div class="ulist"><ul>
 <li>
 <p>
 Thresholds: <em>Subsurface</em> can display the nitrogen, oxygen and the helium partial pressures during
-   the dive, enabled by using the toolbar on the left hand side of the <strong>Dive Profile</strong>
-   panel. For each of these graphs users can specify a threshold value on the right-hand side of the
+   the dive, done by using the toolbar on the left hand side of the <strong>Dive Profile</strong>
+   panel. For each of these graphs you can specify a threshold value on the right-hand side of the
    Preferences panel. If any of the graphs go above the specified threshold level, the graph is
-   highlighted in red, indicating that the particular partial pressure threshold has been exceeded.
+   highlighted in red, indicating the particular partial pressure threshold has been exceeded.
 </p>
 </li>
 <li>
@@ -4165,23 +4213,25 @@ _Max pO<sub>2</sub> is used for calculating the MOD when displaying the maximum
 </li>
 <li>
 <p>
-<em>Draw dive computer reported ceiling red</em>: This checkbox allows exactly what it says. By default
+<em>Draw dive computer reported ceiling red</em>: This checkbox does exactly what it says. By default
    the computer reported ceiling is shown in white.
    Not all dive computers report ceiling values. If the dive computer does report it, it may differ
    from the ceilings calculated by <em>Subsurface</em> because of the different algorithms and
-   gradient factors, as well as the dynamic way that a
-   dive computer can calculate ceilings during a dive.
+   gradient factors, as well as the dynamic way a
+   dive computer calculates ceilings during a dive.
 </p>
 </li>
 <li>
 <p>
-<em>Show unused cylinders in Equipment Tab</em>: This checkbox allows display of information about unused cylinders when viewing the <strong>Equipment Tab</strong>. Conversely, if this box is not checked, and if any cylinders entered using the <strong>Equipment Tab</strong> are not used (e.g. there was no gas switch to such a cylinder), then these cylinders are omitted from that list.
+<em>Show unused cylinders in Equipment Tab</em>: This checkbox allows display of information about unused cylinders when viewing the
+<strong>Equipment Tab</strong>. If this box is not checked, and if any cylinders entered using the <strong>Equipment Tab</strong> are not used (e.g. there
+was no gas switch to such a cylinder), then these cylinders are omitted from that list.
 </p>
 </li>
 <li>
 <p>
-<em>Show average depth</em>: If this box is checked, the <strong>Dive Profile</strong> panel contains a grey line that indicates
-    the mean depth of the dive up to any time instant during the dive. Normally this is a u-shaped line indicating the deepest mean depth just before the
+<em>Show average depth</em>: If this box is checked, the <strong>Dive Profile</strong> panel contains a grey line that shows
+    the mean depth of the dive, up to any time instant during the dive. Normally this is a u-shaped line indicating the deepest mean depth just before
    ascent.
 </p>
 </li>
@@ -4197,8 +4247,8 @@ _Max pO<sub>2</sub> is used for calculating the MOD when displaying the maximum
 Gradient Factors (GFLow and GFHigh):* Set the <em>gradient factors</em> used while diving. GF_Low is
    the gradient factor at depth and GF_High is used just below the surface.
    At intermediate depths gradient factors between GF_Low and GF_High are used.
-   Gradient factors add conservatism to the nitrogen exposure during a dive, in a
-   similar way that many dive computers have a conservatism setting. The lower
+   Gradient factors add conservatism to nitrogen exposure during a dive, in a
+   similar way that many dive computers have a conservative setting. The lower
    the value of a gradient factor, the more conservative the calculations are with
    respect to nitrogen loading and the deeper the ascent ceilings are. Gradient
    factors of 20/60 are considered conservative and values of 70/90 are considered
@@ -4221,8 +4271,8 @@ Gradient Factors (GFLow and GFHigh):* Set the <em>gradient factors</em> used whi
 </li>
 <li>
 <p>
-<em>CCR: Show setpoints when viewing pO2:</em> With this checkbox ativated, the pO<sub>2</sub>
-    graph on the dive profile has an overlay in red which inticates the CCR setpoint
+<em>CCR: Show setpoints when viewing pO2:</em> With this checkbox activated, the pO<sub>2</sub>
+    graph on the dive profile has an overlay in red which indicates the CCR setpoint
     values. See the section on <a href="#S_CCR_dives">Closed Circuit Rebreather dives</a>.
 </p>
 </li>
@@ -4250,7 +4300,7 @@ Gradient Factors (GFLow and GFHigh):* Set the <em>gradient factors</em> used whi
 </li>
 <li>
 <p>
-<em>pSCR O<sub>2</sub> metabolism rate:</em> For a semiclosed rebreather (pSCR) system, this is the
+<em>pSCR O<sub>2</sub> metabolism rate:</em> For a semi-closed rebreather (pSCR) system, this is the
     volume of oxygen used by a diver during a minute. Set this value for pSCR dive planning
     and decompression calculations.
 </p>
@@ -4274,22 +4324,22 @@ Gradient Factors (GFLow and GFHigh):* Set the <em>gradient factors</em> used whi
 <img src="images/Pref4_f20.jpg" alt="FIGURE: Preferences Language page" />
 </div>
 </div>
-<div class="paragraph"><p>A checkbox allows one to use the <em>System Default</em> language which in most cases
+<div class="paragraph"><p>A checkbox lets you use the <em>System Default</em> language which in most cases
 will be the correct setting; with this <em>Subsurface</em> simply runs in the same
-language / country settings as the underlying operating system. If this is for some reason
-undesirable one can uncheck this checkbox and pick a language / country
-combination from the list of included localizations. The <em>Filter</em> text box allows
-one to list similar languages. For instance there are several system variants of English
+language / country settings as the underlying operating system.
+To change it, uncheck this checkbox and pick a language / country
+combination from the list of locations. The <em>Filter</em> text box
+lists similar languages. For instance there are several system variants of English
 or French. <strong>This particular preference requires a restart of <em>Subsurface</em> to take
 effect</strong>.</p></div>
 </div>
 <div class="sect2">
 <h3 id="_network">12.5. Network</h3>
 <div class="paragraph"><p>This panel facilitates communication between <em>Subsurface</em> and data sources on the Internet.
-This is important, for instance, when <em>Subsurface</em> needs to communicate with Internet
-services such as Cloud storage or the <a href="#S_Companion"><em>Subsurface Companion app</em></a>. These Internet requirements are determined by one&#8217;s type of
+This is important, for instance, when <em>Subsurface</em> needs to communicate with web
+services such as Cloud storage or the <a href="#S_Companion"><em>Subsurface Companion app</em></a>. These Internet requirements are determined by your type of
 connection to the Internet and by the Internet Service Provider (ISP) used.
-One&#8217;s ISP should provide the appropriate information.</p></div>
+Your ISP should provide the appropriate information.</p></div>
 <div class="imageblock" style="text-align:center;">
 <div class="content">
 <img src="images/Pref5_f20.jpg" alt="FIGURE: Preferences Network page" />
@@ -4310,16 +4360,16 @@ from one&#8217;s ISP.
 </li>
 <li>
 <p>
-<em>Subsurface cloud storage</em>: To store one&#8217;s dive log in the cloud, a valid email address
-   and password are required. This allows <em>Subsurface</em> to email security information
-   regarding cloud storage to a user, and to set up the cloud storage appropriately.
+<em>Subsurface cloud storage</em>: To store your dive log in the cloud, a valid email address
+   and password are required. This lets <em>Subsurface</em> email security information
+   regarding cloud storage to you, and to set up cloud storage appropriately.
    Two additional options are given:
 </p>
 <div class="ulist"><ul>
 <li>
 <p>
 <em>Sync to cloud in the background</em>: This option allows saving of dive information to the cloud storage
-   while the user performs other tasks within <em>Subsurface</em>.
+   while you do other things within <em>Subsurface</em>.
 </p>
 </li>
 <li>
@@ -4332,36 +4382,35 @@ from one&#8217;s ISP.
 </li>
 <li>
 <p>
-<em>Subsurface web service</em>: When one subscribes to the <a href="#S_Companion">Subsurface web service</a>, a very
+<em>Subsurface web service</em>: When you subscribe to the <a href="#S_Companion">Subsurface web service</a>, a very
      long and hard-to-remember userID is issued. This is the place to save that userID. By
-     checking the option <em>Save User ID locally?</em>, one ensures that a local copy of that userID
-     is saved.
+     checking the option <em>Save User ID locally?</em>, you ensure a local copy of that userID is saved.
 </p>
 </li>
 </ul></div>
 </div>
 <div class="sect2">
-<h3 id="S_Facebook">12.6. Facebook Accesss</h3>
-<div class="paragraph"><p>This panel allows one to log into a Facebook account in order to transfer information
-from Subsurface to Facefook.</p></div>
+<h3 id="S_Facebook">12.6. Facebook Access</h3>
+<div class="paragraph"><p>This panel lets you log into a Facebook account in order to transfer information
+from Subsurface to Facebook.</p></div>
 <div class="imageblock" style="text-align:center;">
 <div class="content">
 <img src="images/Pref6_f20.jpg" alt="FIGURE: Facebook login panel" />
 </div>
 </div>
-<div class="paragraph"><p>If one provides a valid Facebook userID and password, a
-connection to Facebook is created. The connection to Facebook is closed when one
-closes down Subsurface. Currently the checkbox labelled "Keep me logged in to Subsurface",
+<div class="paragraph"><p>If you provide a valid Facebook userID and password, a
+connection to Facebook is created. That connection is closed when one
+closing down Subsurface. Currently the checkbox labelled "Keep me logged in to Subsurface",
 on the login screen has no effect.
 See the section <a href="#S_facebook">Exporting dive profiles to Facebook</a>
 for more information.</p></div>
 </div>
 <div class="sect2">
 <h3 id="_georeference">12.7. Georeference</h3>
-<div class="paragraph"><p><em>Subsurface</em> provides a geo-lookup service (that is, given the coordinates of a dive site (derived from
+<div class="paragraph"><p><em>Subsurface</em> provides a geo-lookup service (that is, given the coordinates of a dive site) derived from
 a click on the <strong>Dive Map panel</strong> at the bottom right of the <em>Subsurface</em> window, or from a GPS instrument or
-from the <em>Subsurface</em> Companion app), a lookup on the Internet is performed to find
-the name of the closest known location. Obviously this function only works if <em>Subsurface</em> has an
+from the <em>Subsurface</em> Companion app). A search on the Internet is done to find
+the name of the closest known location. This function only works if <em>Subsurface</em> has an
 Internet connection. The preference of the dive site name can be configured, e.g. <em>Country/State/City</em>
 or <em>City/State/Country</em> (see image below).</p></div>
 <div class="imageblock" style="text-align:center;">
@@ -4375,7 +4424,7 @@ or <em>City/State/Country</em> (see image below).</p></div>
 <div class="sect1">
 <h2 id="S_DivePlanner">13. The <em>Subsurface</em> dive planner</h2>
 <div class="sectionbody">
-<div class="paragraph"><p>Dive planning is an advanced feature of <em>Subsurface</em>, accessible by selecting
+<div class="paragraph"><p>Dive planning is an advanced feature of <em>Subsurface</em>, accessed by selecting
 <em>Log &#8594;  Plan Dive</em> from the main menu. It allows calculation of
 nitrogen load during a dive by using the Bühlmann ZH-L16 algorithm with the addition
 of gradient factors as implemented by Erik Baker.</p></div>
@@ -4431,9 +4480,9 @@ A user who is not absolutely sure about any of the above requirements should not
 <div class="sect2">
 <h3 id="_the_em_subsurface_em_dive_planner_screen">13.1. The <em>Subsurface</em> dive planner screen</h3>
 <div class="paragraph"><p>Like the <em>Subsurface</em> dive log, the planner screen is divided into several sections (see image below). The <strong>setup</strong>
-parameters for a dive are entered into the several sections on the left hand side of the screen.
-The setup is divided into several sections: Available Gases, Rates, Planning, Gas Options and Notes.</p></div>
-<div class="paragraph"><p>At the top right hand is a green <strong>design panel</strong> upon which the profile of the dive can be
+parameters for a dive are entered into the sections on the left hand side of the screen.
+They are: Available Gases, Rates, Planning, Gas Options and Notes.</p></div>
+<div class="paragraph"><p>At the top right hand is a green <strong>design panel</strong> on which the profile of the dive can be
 manipulated directly by dragging and clicking as explained below. This feature makes the
 <em>Subsurface</em> dive planner unique in ease of use.</p></div>
 <div class="paragraph"><p>At the bottom right is a text panel with a heading of <em>Dive Plan Details</em>. This is where the details of
@@ -4450,7 +4499,7 @@ any warning messages about the dive plan are printed.</p></div>
 <div class="ulist"><ul>
 <li>
 <p>
-Towards the centre bottom of the planner (circled in blue in the image above) is a dropbox with three options. Select the appropriate one of these:
+Towards the center bottom of the planner (circled in blue in the image above) is a dropbox with three options. Select the appropriate one of these:
 </p>
 <div class="ulist"><ul>
 <li>
@@ -4477,10 +4526,10 @@ Choose the Open Circuit option.
 </li>
 <li>
 <p>
-In the top left-hand area of the planning screen, ensure that the constant dive parameters are
+In the top left-hand area of the planning screen, be sure the constant dive parameters are
   appropriate. These are: Start date and time of the intended dive, Atmospheric Pressure and Altitude
   above sea level of the dive site. The atmospheric pressure can also be entered as an altitude
-  in metres, assuming a sea-level atmospheric pressure of 1.013 bar.
+  in meters, assuming a sea-level atmospheric pressure of 1.013 bar.
 </p>
 </li>
 <li>
@@ -4503,7 +4552,7 @@ The profile of the planned dive can be created in two ways:
 <li>
 <p>
 Drag the waypoints
-    (the small white circles) on the existing dive profile in a way to represent the dive. Additional
+    (the small white circles) on the existing dive profile to represent the dive. Additional
     waypoints can be created by double-clicking the existing dive profile. Waypoints can be deleted
     by right-clicking a particular waypoint and selecting the <em>delete</em> item from the resulting
     context menu.
@@ -4527,23 +4576,24 @@ The most efficient way to create a dive profile is to enter the appropriate valu
 <div class="sect3">
 <h4 id="_recreational_dives">13.2.1. Recreational dives</h4>
 <div class="paragraph"><p>Recreational mode is what comes closest to planning a dive based on the non-decompression limit (NDL).
-It computes the maximal time a diver can stay at the current depth without incurring any mandatory decompression
+It computes the maximum time a diver can stay at the current depth without needing mandatory decompression
 stops and without using more than the existing gas (minus a reserve). The planner automatically takes
 into account the nitrogen load incurred in previous dives. But conventional dive tables are also used in a
 way that can take into account previous dives. Why use a dive planner for recreational dives? Using
-recreational dive tables, the maximum depth of a dive is taken into account. However, few dives are
-undertaken at a constant depth corresponding to the maximum depth (i.e. a "square" dive profile). This means
-that dive tables overestimate the nitrogen load incurred during previous dives. The <em>Subsurface</em>
+recreational dive tables, the maximum depth of a dive is taken into account. But few dives are
+done at a constant depth corresponding to the maximum depth (i.e. a "square" dive profile). This means
+dive tables overestimate the nitrogen load incurred during previous dives. The <em>Subsurface</em>
 dive planner calculates nitrogen load according to the real dive profiles of all uploaded previous dives,
-in a similar way as dive computers calculate nitrogen load during a dive. This means that the diver gets <em>credit</em>
-in terms of nitrogen loading for not remaining at maximum depth during previous dives, enabling planning of a
-longer subsequent dive. For the planner to work it is therefore crucial to upload all previous dives
-onto <em>Subsurface</em> before performing dive planning.</p></div>
-<div class="paragraph"><p>To plan a dive, the appropriate settings need to be defined.</p></div>
+in a similar way as dive computers calculate nitrogen load during a dive. This means that the diver gets <em>credit,</em>
+in terms of nitrogen load, for not remaining at maximum depth during
+previous dives, so a longer subsequent dive can be planned.
+ For the planner to work it&#8217;s crucial to upload all previous dives
+onto <em>Subsurface</em> before doing dive planning.
+To plan a dive, the appropriate settings need to be defined.</p></div>
 <div class="ulist"><ul>
 <li>
 <p>
-Ensure that the date and time is set to that of the intended dive. This allows calculation of
+Ensure the date and time is set to that of the intended dive. This allows calculation of
 the nitrogen load incurred during previous dives.
 </p>
 </li>
@@ -4563,21 +4613,21 @@ Then define the cylinder size,
 <li>
 <p>
 The planner calculates whether the specified cylinder contains enough air/gas to complete
-  the planned dive. In order for this to be realistic, under <em>Gas options</em>, specify an appropriate
+  the planned dive. In order for this to be accurate, under <em>Gas options</em>, specify an appropriate
   surface air consumption (SAC) rate for <em>Bottom SAC</em>. Suitable values are between 15 l/min and 30 l/min,
   with novice divers or difficult dives requiring SAC rates closer to 30l/min.
 </p>
 </li>
 <li>
 <p>
-Define the amount of gas that the cylinder must have at the end of the bottom section of the
+Define the amount of gas the cylinder must have at the end of the bottom section of the
   dive just before ascent. A value of 50 bar is often used. The reason for this reserve gas is to provide for the possible
-  need to bring one&#8217;s buddy to the surface using gas sharing. How much gas is used in
-  sharing depends on the depth of the ascent. This can be a bit hard to estimate, so most agencies assume a
+  need to bring a buddy to the surface using gas sharing. How much gas is used in
+  sharing depends on the depth of the ascent. This can be difficult to estimate, so most agencies assume a
   fixed amount of gas, or actually of pressure e.g. 40 or 50 bar or 25% or 33% (rule of thirds). But <em>Subsurface</em> can do better
   because it knows about the ascent and that is why we add the amount of gas during the ascent (i.e. the "deco gas“).
-  Subsurface still uses a fixed pressure „reserve“ but that is supposed to be for the additional gas used around the realisation
-  that there is a problem and one&#8217;s pulse rate goes up when one starts to buddy breathe. This reserve amount is user configurable.
+  Subsurface still uses a fixed pressure "reserve" but that&#8217;s supposed to be for the additional gas used when
+  there&#8217;s a problem and your pulse rate goes up when you start to buddy breathe. This reserve amount is user configurable.
 </p>
 </li>
 <li>
@@ -4598,16 +4648,16 @@ The ascent speed can be changed. The default ascent speeds are those considered
 </p>
 </li>
 </ul></div>
-<div class="paragraph"><p>The dive profile in the planner indicates the maximum dive time within no-deco limits using the
+<div class="paragraph"><p>The dive profile in the planner shows the maximum dive time within no-deco limits using the
 Bühlmann ZH-L16 algorithm and the gas and depth settings specified as described above. The <em>Subsurface</em> planner
 allows rapid assessment of dive duration as a function of dive depth, given the nitrogen load incurred during previous dives. The
 dive plan includes estimates of the amount of air/gas used, depending on the cylinder settings specified
 under <em>Available gases</em>. If the initial cylinder pressure is set to 0, the dive duration shown is the
 true no-deco limit (NDL) without taking into account gas used during the dive. If the surface above the dive profile is RED
 it means that recreational dive limits are exceeded and either the dive duration or the dive depth needs to be reduced.</p></div>
-<div class="paragraph"><p>Below is an image of a dive plan for a recreational dive at 30 metres. Although the no-deco limit (NDL) is 23
-minutes, the duration of the dive is limited by the amount of air in the cylinder, reflected by the information in the
-text box at the bottom right of the panel that requires sufficient air for buddy-sharing during the ascent.</p></div>
+<div class="paragraph"><p>Below is an image of a dive plan for a recreational dive at 30 meters. Although the no-deco limit (NDL) is 23
+minutes, the duration of the dive is limited by the amount of air in the cylinder. That is shown in the
+text box at the bottom right of the panel, requiring sufficient air for buddy-sharing during ascent.</p></div>
 <div class="imageblock" style="text-align:center;">
 <div class="content">
 <img src="images/rec_diveplan.jpg" alt="FIGURE: A recreational dive plan: setup" />
@@ -4617,20 +4667,21 @@ text box at the bottom right of the panel that requires sufficient air for buddy
 <div class="sect3">
 <h4 id="_non_recreational_open_circuit_dives_including_decompression">13.2.2. Non-recreational open circuit dives, including decompression</h4>
 <div class="paragraph"><p>Non-recreational dive planning involves exceeding the no-deco limits and/or using multiple breathing gases.
-Such dives are planned in three stages:</p></div>
-<div class="paragraph"><p><strong>a) Nitrogen management</strong>: This is performed by specifying the rates for descent and ascent,
+These dives are planned in three stages:</p></div>
+<div class="paragraph"><p><strong>a) Nitrogen management</strong>: This is done by specifying the rates for descent and ascent,
 as well as the deco model (GFLow, GFHigh or Conservatism level) under the headings <em>Rates</em> and <em>Planning</em>
 to the bottom left of the planning screen. Two deco models are supported the Bühlmann model and the VPM-B
 model. Select one of the two models. When selecting the Bühlmann model, the gradient factors (GF_high and GF_low
 need to be specified. Initially, the GFHigh and GFLow values in the <em>Preferences</em>
 panel of <em>Subsurface</em> is used. If these are changed within the planner (see <em>Gas Options</em> within
 the planner), the new values are
-used without changing the original values in the <em>Preferences</em>. Gradient Factor settings strongly affect the calculated ceilings and their depths.
-A very low GFLow value brings about decompression stops early on during the dive.
+used without changing the original values in the <em>Preferences</em>.
+Gradient Factor settings strongly affect the calculated ceilings and their depths.
+A very low GFLow value brings on decompression stops early during the dive.
  ** For more information about Gradient factors, see the section on <a href="#S_GradientFactors">Gradient Factor Preference settings</a>.</p></div>
 <div class="paragraph"><p>If the VPM-B model is selected, the Conservatism_level needs to be specified on a scale of 0 (least conservative) to 4 (most conservative).
 This model tends to give deco stops at deeper levels than the Bühlmann model and often results in slightly shorter
-dive durations than the Bühlmann model. When selecting one of these models, keep in mind that they are NOT exact physiological models but
+dive durations than the Bühlmann model. When selecting one of these models, keep in mind they are NOT exact physiological models but
 only mathematical models that appear to work in practice.</p></div>
 <div class="paragraph"><p>For more information external to this manual see:</p></div>
 <div class="ulist"><ul>
@@ -4652,11 +4703,11 @@ An excellent non-technical review that discusses both the Bühlmann deco model a
 </li>
 </ul></div>
 <div class="paragraph"><p>The ascent rate is critical for nitrogen off-gassing at the end of the dive and is specified
-for several depth ranges, utilising the average (or mean) depth as a yardstick. The mean depth
-of the dive plan is indicated by a light grey line on the dive profile. Ascent rates
+for several depth ranges, using the average (or mean) depth as a yardstick. The mean depth
+of the dive plan is shown by a light grey line on the dive profile. Ascent rates
 at deeper levels are often in the range of 8-12 m/min, while ascent rates near the surface are
 often in the range of 4-9 m/min. The descent rate is also specified. If the option <em>Drop to first depth</em>
-is activated, then the descent phase of the planned dive will be at the maximal descent rate specified
+is activated, the descent phase of the planned dive will be at the maximal descent rate specified
 in the <em>Rates</em> section of the dive setup.</p></div>
 <div class="paragraph"><p><strong>b) Oxygen management</strong>: In the <strong>Gas Options</strong> part of the dive specification, the maximum partial
 pressure for oxygen needs to be specified for the
@@ -4666,46 +4717,49 @@ used values are 1.4 bar for the bottom part of the dive and 1.6 bar for any deco
 stages. Normally, a partial pressure of 1.6 bar is not exceeded. PO2 settings and the depth at which switching to a gas takes place can also be edited in the
 <em>Available Gases</em> dialog. Normally the planner decides on switching to a new gas when, during
 ascent, the partial pressure of the new gas has increased to 1.6 bar.</p></div>
-<div class="paragraph"><p><strong>c) Gas management</strong>: With open-circuit dives this is a primary consideration. One needs to keep within the limits of the amount of gas within the dive
+<div class="paragraph"><p><strong>c) Gas management</strong>: With open-circuit dives this is a primary
+consideration. Divers need to keep within the limits of the amount of
+gas within the dive
 cylinder(s), allowing for an appropriate margin for a safe return to the surface, possibly
 sharing with a buddy. Under the <em>Gas Options</em> heading, specify the best (but conservative) estimate
 of your surface-equivalent air consumption (SAC, also termed RMV) in
-litres/min (for the time being, only SI units are supported).  Specify the SAC during the
+liters/min (for the time being, only SI units are supported).  Specify the SAC during the
 bottom part of the dive (<em>bottom SAC</em>) as well as during the decompression or safety stops of the
-dive (<em>deco SAC</em>). Values of 15-30 l/min are common. For good gas management, a thumbsuck guess
-is not sufficient and one needs to
-monitor one&#8217;s gas consumption on a regular basis, dependent on different dive conditions and/or equipment.
+dive (<em>deco SAC</em>). Values of 15-30 l/min are common. For good gas management, a guess
+is not sufficient and you needs to
+monitor gas consumption on a regular basis, dependent on different dive conditions and/or equipment.
 The planner calculates the total volume of gas used during the dive and issues a warning
-if one exceeds the total amount of gas available. Good practice demands that one does not dive to
-the limit of the gas supply but that an appropriate reserve is kept for unforeseen circumstances.
+if you exceeds the total amount of gas available. Good practice demands that divers not dive to
+the limit of the gas supply but that an appropriate reserve is kept
+for unforeseen circumstances.
 For technical diving, this reserve can be up to 66% of the total available gas.</p></div>
-<div class="paragraph"><p>Now (at last) one can start the detailed time-depth planning of the dive. <em>Subsurface</em> offers a unique
-graphical interface for performing this part of the planning. The mechanics of doing this is
+<div class="paragraph"><p>Now you can start the detailed time-depth planning of the dive. <em>Subsurface</em> offers an unique
+graphical interface for doing planning. Themechanics are
 similar to hand-entering a dive profile in the dive log part of <em>Subsurface</em>. Upon activating the
-planner, a default dive of depth 15 m for 40 min is offered in the bue design surface to the top
+planner, a default dive of depth 15 m for 40 min is offered in the blue 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
+line and ensuring the profile reflects the intended dive. Drag the waypoints to represent
 the depth and duration of the dive. It is NOT necessary to specify the ascent part of the dive
 since the planner calculates this, based on the settings that have been specified.
-If any of the management limits (for nitrogen, oxygen or gas) is exceeded, the surface
+If any of the management limits (for nitrogen, oxygen or gas) are exceeded, the surface
 above the dive profile changes from BLUE to RED.</p></div>
 <div class="paragraph"><p>Each waypoint on the dive profile creates a <em>Dive Planner Point</em> in the table on the
-left of the dive planner panel. Ensure that the <em>Used Gas</em> value in each row
+left of the dive planner panel. Be sure the <em>Used Gas</em> value in each row
 of that table corresponds to one of the gas mixtures specified in the <em>Available Gases</em> table.
 Add new waypoints until the main features of the dive have been completed, e.g. the
 bottom time segment and deep stops (if these are implemented). Leave the remaining
 waypoints on the ascent to <em>Subsurface</em>. In most cases <em>Subsurface</em>
-computes additional way points in order to fulfil decompression requirements for that
-dive. A waypoint can be moved by selecting that waypoint and by using the arrow keys.
+computes additional way points in order to fulfill decompression requirements for that
+dive. A waypoint can be moved by selecting it and by using the arrow keys.
 The waypoints listed in the <em>Dive Planner Points</em> dialogue can be edited by hand in
-order to obtain a precise presentation of the dive plan. In fact, one can create the
+order to get a precise presentation of the dive plan. In fact, you can create the
 whole dive profile by editing the <em>Dive Planner Points</em> dialog.</p></div>
-<div class="paragraph"><p>Indicate any changes in gas cylinder used by indicating gas changes as explained
+<div class="paragraph"><p>Show any changes in gas cylinder used by indicating gas changes as explained
 in the section <a href="#S_CreateProfile">hand-creating a dive profile</a>. These changes should
 reflect the cylinders and gas compositions defined in the table with <em>Available Gases</em>.
 If two or more gases are used, automatic gas switches will be suggested during the ascent to
-the surface. However, these changes can be deleted by right-clicking the gas change and by
+the surface. These changes can be deleted by right-clicking the gas change and
 manually creating a gas change by right-clicking on the appropriate
 waypoint.</p></div>
 <div class="paragraph"><p>A non-zero value in the "CC set point" column of the table of dive planner points
@@ -4723,7 +4777,7 @@ and using the settings as described above.</p></div>
 <img src="images/DivePlanner2_f20.jpg" alt="FIGURE: Planning a dive: setup" />
 </div>
 </div>
-<div class="paragraph"><p>Once the above has been completed, one can save it by clicking the <em>Save</em> button
+<div class="paragraph"><p>Once the above steps have been completed, save by clicking the <em>Save</em> button
 towards the top middle of the planner. The saved dive plan will appear
 in the <strong>Dive List</strong> panel of <em>Subsurface</em>.</p></div>
 <div class="paragraph"><p><strong>The dive plan details</strong></p></div>
@@ -4748,7 +4802,7 @@ The parameters of the pSCR dive can be set by selecting  <em>File &#8594;   Pref
 from the main menu, where the gas consumption calculation takes into account the pSCR dump
 ratio (default 10:1) as well as the metabolism rate. The calculation also takes the oxygen drop
 accross the mouthpiece of the rebreather into account. If the
-pO<sub>2</sub> drops below what is considered a save value, a warning appears in the <em>Dive plan
+pO<sub>2</sub> drops below what is considered safe, a warning appears in the <em>Dive plan
 details</em>. A typical pSCR configuration is with a single cylinder and one or more bail-out
 cylinders. Therefore the setup of the <em>Available gases</em> and the <em>Dive planner points</em> tables
 are very similar to that of a CCR dive plan, described below. However, no oxygen setpoints
@@ -4772,11 +4826,11 @@ cylinder since it is implied when the <em>CCR</em> dropdown selection is made.</
 the main menu. All user-entered segments in the <em>Dive planner points</em> table
 use the default setpoint value. Then, different setpoints can be specified for dive segments
 in the <em>Dive planner points</em> table. A zero setpoint
-means the diver bails out to open circuit mode for that segment. The decompression is always calculated
+means the diver bails out to open circuit mode for that segment. Decompression is always calculated
 using the setpoint of the last manually entered segment. So, to plan a bail out ascent for a
 CCR dive, add a one-minute dive segment to the end with a setpoint value of 0. The decompression
-algorithm does not switch deco-gases automatically while in CCR mode (i.e. when a positive setpoint is specified) but,
-of course, this is calculated for bail out ascents.</p></div>
+algorithm does not switch deco-gases automatically while in CCR mode (i.e. when a positive setpoint is specified) but
+this is calculated for bail out ascents.</p></div>
 <div class="paragraph"><p>The dive profile for a CCR dive may look something like the image below.</p></div>
 <div class="imageblock" style="text-align:center;">
 <div class="content">
@@ -4784,16 +4838,16 @@ of course, this is calculated for bail out ascents.</p></div>
 </div>
 </div>
 <div class="paragraph"><p>Note that, in the <em>Dive plan details</em>, the gas consumption for a CCR segment is not calculated,
-so gas consumptions of 0 litres are the norm.</p></div>
+so gas consumptions of 0 liters are the norm.</p></div>
 </div>
 <div class="sect2">
 <h3 id="S_Replan">13.5. Modifying an existing dive plan</h3>
 <div class="paragraph"><p>Normally, when a dive plan has been saved, it is accessible from the <strong>Dive List</strong>, like any
-other dive log. Within the <strong>Dive List</strong> there is not a way to change a saved dive plan.
-To perform changes to a dive plan, select it on the <strong>Dive List</strong>. Then, in the main menu,
+other dive log. Within the <strong>Dive List</strong> there is no way to change a saved dive plan.
+To change a dive plan, select it on the <strong>Dive List</strong>. Then, in the main menu,
 select <em>Log &#8594;  Re-plan dive</em>. This will open the selected dive plan within the dive planner,
-allowing changes to be made and saved as usual.</p></div>
-<div class="paragraph"><p>In addition there is the option "Save new". This keeps the original
+letting changes be made and saved as usual.</p></div>
+<div class="paragraph"><p>In addition, there is the option "Save new". This keeps the original
 planned dive and adds a (possibly modified) copy to the dive list. If
 that copy is saved with the same start time as the original, the two
 dives are considered two versions of the same dive and do not
@@ -4803,24 +4857,24 @@ influence other each during decompression calculation (see next section).</p></d
 <h3 id="_planning_for_repetitive_dives">13.6. Planning for repetitive dives</h3>
 <div class="paragraph"><p>Repetitive dives can easily be planned if the dates and start times of the
 repetitive dive set
-is specified appropriately in the top left-hand <em>Start Time</em> field. <em>Subsurface</em>
-calculates the gas loading figures correctly and the effect of the first dive is
+are specified appropriately in the top left-hand <em>Start Time</em> field. <em>Subsurface</em>
+calculates the gas loading figures and the affect of the first dive is
 evaluated on later dives.</p></div>
-<div class="paragraph"><p>If one has just completed a long/deep dive and is planning
-another dive, then highlight, in the <strong>Dive List</strong>, the dive that has just been completed
-and then activate the planner. Depending on the start time of the planned dive,
-the planner takes into account the gas loading incurred during the completed dive
-and allows planning within these limitations.</p></div>
+<div class="paragraph"><p>If you have just completed a long/deep dive and are planning
+another dive, then highlight, in the <strong>Dive List</strong>, the dive that has just been done
+then activate the planner. Depending on the start time of the planned dive,
+the planner takes into account the gas loading during the completed dive
+and plans accordingly.</p></div>
 <div class="paragraph"><p>If only a few standard configurations are used (e.g. in GUE), then a template dive can
-be created conforming to one of the configurations. If one now wishes to plan a dive using
-this configuration, just highlight the template dive in the <strong>Dive List</strong> and activate the
+be created conforming to one of the configurations. If you want to plan a dive using
+this configuration, highlight the template dive in the <strong>Dive List</strong> and activate the
 planner: the planner takes into account the configuration in the highlighted dive.</p></div>
 </div>
 <div class="sect2">
 <h3 id="_printing_the_dive_plan">13.7. Printing the dive plan</h3>
-<div class="paragraph"><p>Selecting the <em>Print</em> button in the planner allows printing of the  <em>Dive Plan Details</em>
-for wet notes. Alternatively one can cut and paste the <em>Dive Plan Details</em> for
-inclusion in a text file or word processing document.</p></div>
+<div class="paragraph"><p>Selecting the <em>Print</em> button in the planner allows printing of the <em>Dive Plan Details</em>
+for wet notes. You can also cut and paste the <em>Dive Plan Details</em> to
+include in a text file or word processing document.</p></div>
 <div class="paragraph"><p>Dive plans have many characteristics in common with dive logs (dive profile, dive notes, etc).
 After a dive plan has been saved, the dive details and gas calculations are saved in
 the <strong>Notes</strong> tab. While a dive plan is being designed, it can be printed using
@@ -4828,7 +4882,7 @@ the <em>Print</em> button in the dive planner. This prints the dive details and
 in the <em>Dive Plan Details</em> panel of the dive planner. However, after the plan has been saved, it is
 represented in a way very similar to a dive log and the gas calculations cannot be
 accessed in the same way as during the planning process. The only way to print the
-dive plan is to use the <em>File &#8594;  Print</em> facility on the main menu in the
+dive plan is to use the <em>File &#8594;  Print</em> function on the main menu in the
 same way as for dive logs or by copy and paste to a word processor.</p></div>
 </div>
 </div>
@@ -4850,7 +4904,7 @@ dealing with the appropriate operations.</p></div>
 </li>
 <li>
 <p>
-<em>Open logbook</em> - This opens the file manager in order to select a dive
+<em>Open logbook</em> - Open the file manager to select a dive
   logbook to open.
 </p>
 </li>
@@ -4861,7 +4915,7 @@ dealing with the appropriate operations.</p></div>
 </li>
 <li>
 <p>
-<em>Save</em> - Save the dive logbook that is currently open.
+<em>Save</em> - Save the dive logbook currently open.
 </p>
 </li>
 <li>
@@ -4876,7 +4930,7 @@ dealing with the appropriate operations.</p></div>
 </li>
 <li>
 <p>
-<em>Close</em> -  Close the dive logbook that is currently open.
+<em>Close</em> -  Close the dive logbook currently open.
 </p>
 </li>
 <li>
@@ -4952,12 +5006,12 @@ dealing with the appropriate operations.</p></div>
 </li>
 <li>
 <p>
-<em>Edit dive</em> - Edit a dive of which the profile was entered by hande and not from a dive computer.
+<em>Edit dive</em> - Edit a dive where the profile was entered by hand and not from a dive computer.
 </p>
 </li>
 <li>
 <p>
-<a href="#S_DivePlanner"><em>Plan Dive</em></a> - This feature allows the planning of dives.
+<a href="#S_DivePlanner"><em>Plan Dive</em></a> - Plan  dives.
 </p>
 </li>
 <li>
@@ -4967,7 +5021,7 @@ dealing with the appropriate operations.</p></div>
 </li>
 <li>
 <p>
-<a href="#S_CopyComponents"><em>Copy dive components</em></a> - By selecting this option, one can copy information
+<a href="#S_CopyComponents"><em>Copy dive components</em></a> - Copy information
   from several fields of a dive log onto the clipboard.
 </p>
 </li>
@@ -4991,7 +5045,7 @@ dealing with the appropriate operations.</p></div>
 </li>
 <li>
 <p>
-<a href="#S_DeviceNames"><em>Edit Device Names</em></a> - Edit the names of dive computers to facilitate your logs.
+<a href="#S_DeviceNames"><em>Edit Device Names</em></a> - Edit the names of dive computers to coordinate your logs.
 </p>
 </li>
 <li>
@@ -5007,7 +5061,7 @@ dealing with the appropriate operations.</p></div>
 <li>
 <p>
 <a href="#S_ViewPanels"><em>All</em></a> - View the four main <em>Subsurface</em> panels
-  simmultaneously.
+  all at once.
 </p>
 </li>
 <li>
@@ -5038,8 +5092,7 @@ dealing with the appropriate operations.</p></div>
 </li>
 <li>
 <p>
-<em>Prev DC</em> - If a single dive was logged from more than one dive computer, switch to data from
-   previous dive computer.
+<em>Prev DC</em> - Switch to data from previous dive computer, if a single dive was logged from more than one.
 </p>
 </li>
 <li>
@@ -5105,7 +5158,7 @@ dealing with the appropriate operations.</p></div>
 <img src="images/icons/drivers.jpg" alt="Note" />
 </td>
 <td class="content">The operating system of the desktop computer needs the appropriate drivers in
-order to communicate with the dive computer in whichever way the dive
+order to communicate with the dive computer, the way the dive
 computer prefers (e.g. Bluetooth, USB, infra-red).</td>
 </tr></table>
 </div>
@@ -5145,12 +5198,12 @@ On a Mac users sometimes have to manually hunt for the correct
 <td class="icon">
 <img src="images/icons/usb.jpg" alt="Note" />
 </td>
-<td class="content">When a user connects the dive computer by using a USB connector, usually
-<em>Subsurface</em> will either propose a drop down list that contains the
+<td class="content">When connecting a dive computer by using a USB connector, usually
+<em>Subsurface</em> will either propose a drop down list with the
 correct device name (or mount point for the Uemis Zurich), or it will
 disable the device select drop down if no device name is needed at
 all. In the rare cases where this doesn&#8217;t work, here are some
-suggestions of ways to find out what the device name is:</td>
+ways to find out what the device name is:</td>
 </tr></table>
 </div>
 <div class="paragraph"><div class="title">On Windows:</div><p>Simply try COM1, COM2, etc. The drop down list should contain all connected COM
@@ -5207,12 +5260,12 @@ ftdi_sio: v1.6.0:USB FTDI Serial Converters Driver</code></pre>
 detected and connected to <code>ttyUSB3</code>. This information can now be used in
 the import settings as <code>/dev/ttyUSB3</code> which directs Subsurface to the correct
 USB port.</p></div>
-<div class="paragraph"><p>Ensuring that the user has write permission to the USB serial port:</p></div>
+<div class="paragraph"><p>Ensuring the user has write permission to the USB serial port:</p></div>
 <div class="paragraph"><p>On Unix-like operating systems the USB ports can only be accessed by users who
 are members
 of the <code>dialout</code> group. If one is not root, one may not be a member of
 that group and
-will not be able to use the USB port. Let us assume one&#8217;s username is <em>johnB</em>.</p></div>
+won&#8217;t be able to use the USB port. Let us assume one&#8217;s username is <em>johnB</em>.</p></div>
 <div class="ulist"><ul>
 <li>
 <p>
@@ -5250,20 +5303,20 @@ dives.</p></div>
 <img src="images/icons/bluetooth.jpg" alt="Note" />
 </td>
 <td class="content">For dive computers communicating through Bluetooth like the Heinrichs
-Weikamp Frog or the Shearwater Predator and Petrel there is a
-different procedure to get the devices name to communicate with
+Weikamp Frog or the Shearwater Predator, Petrel and Nerd there is a
+different procedure to get the device’s name to communicate with
 <em>Subsurface</em>. Follow these steps:</td>
 </tr></table>
 </div>
 <div class="ulist"><ul>
 <li>
 <p>
-<strong>For the dive computer, after enabling Bluetooth, ensure it is in Upload mode.</strong>
+<strong>For the dive computer, after enabling Bluetooth, be sure it is in Upload mode.</strong>
 </p>
 </li>
 </ul></div>
 <div class="paragraph"><p>For Bluetooth pairing of the dive computer, refer to the
-manufacturer&#8217;s user guide. When using a Shearwater Predator/Petrel, select
+manufacturer&#8217;s user guide. When using a Shearwater Predator/Petrel/Nerd, select
 <em>Dive Log &#8594;  Upload Log</em> and wait for the <em>Wait PC</em> message.</p></div>
 <div class="ulist"><ul>
 <li>
@@ -5291,14 +5344,14 @@ other software, remove the existing pairing with the dive computer.</p></div>
 Bluetooth Device&#8230;</em>. The dive computer should then show up in the list of devices. Select it and go
 through the pairing process. This step should only be needed once for
 initial setup.</p></div>
-<div class="paragraph"><p>Once the pairing is completed the correct device is shown in the
+<div class="paragraph"><p>Once the pairing is complete, the correct device is shown in the
 <em>Device or Mount Point</em> drop-down in the <em>Subsurface</em> <strong>Import</strong> dialog.</p></div>
 </div>
 <div class="sect3">
 <h4 id="_on_linux">15.3.3. On Linux</h4>
-<div class="paragraph"><p>Ensure Bluetooth is enabled on the <em>Subsurface</em> computer.
+<div class="paragraph"><p>Be sure Bluetooth is enabled on the <em>Subsurface</em> computer.
 On most common distributions this should be true out of the box and
-pairing should be straight forward. For instance, Gnome3 shows a
+pairing should be straightforward. For instance, Gnome3 shows a
 Bluetooth icon on the right of the toolbar at the top of the screen.
 Users have reported difficulties with some Bluetooth controllers.  If you have an onboard controller,
 try that first.  It is simplest if you remove any USB Bluetooth dongles.  If you have a USB dongle that
@@ -5323,7 +5376,7 @@ Download the dives with Subsurface
 </p>
 </li>
 </ul></div>
-<div class="paragraph"><p>Ensure the dive computer is in upload mode. On the <em>Shearwater Petrel</em> and <em>Petrel 2</em>,
+<div class="paragraph"><p>Ensure the dive computer is in upload mode. On the <em>Shearwater Petrel</em>, <em>Petrel 2</em> and <em>Nerd</em>
 cycle through the menu, select <em>Dive Log</em>, then <em>Upload Log</em>.  The display will read <em>Initializing</em>, then
 <em>Wait PC 3:00</em> and will countdown.  Once the connection is established, the display reads <em>Wait CMD &#8230;</em>
 and the countdown continues. When downloading the dive from Subsurface, the display reads <em>Sending</em> then
@@ -5340,7 +5393,7 @@ in the previous section). On the command terminal, enter:</p></div>
 environment of the operating system. After setting the dive computer to upload mode, click the Bluetooth icon in the system tray
 and select <em>Add new device</em>. The dive computer should appear. If asked for a password, enter 0000.
 Write down or copy the MAC address of your dive computer - this needed later and should be in the form  00:11:22:33:44:55.</p></div>
-<div class="paragraph"><p>If the graphical method didn&#8217;t work, pair the device from the command line. Open a terminal
+<div class="paragraph"><p>If the graphical method doesn&#8217;t work, pair the device from the command line. Open a terminal
 and use <code>hciconfig</code> to check the Bluetooth controller status</p></div>
 <div class="literalblock">
 <div class="content">
@@ -5440,12 +5493,17 @@ the appropriate channel for the dive computer is probably:</p></div>
 <div class="ulist"><ul>
 <li>
 <p>
+<em>Shearwater Petrel 1</em>: channel 1
+</p>
+</li>
+<li>
+<p>
 <em>Shearwater Petrel 2</em>: channel 5
 </p>
 </li>
 <li>
 <p>
-<em>Shearwater Petrel 1</em>: channel 1
+<em>Shearwater Nerd</em>: channel 5
 </p>
 </li>
 <li>
@@ -5514,7 +5572,7 @@ information about dive spots and
 equipment. Buddy information is not yet downloadable.
 Things are very similar to a normal USB-connected dive computer
 (the Uemis is one of those that recharge when connected to the USB port).
-The main difference is that one does not enter a
+The main difference is that you don’t enter a
 device name, but instead the location where the UEMISSDA file system is
 mounted once connected to the dive computer. On Windows this is a drive letter (
 often <em>E:</em> or <em>F:</em>), on a Mac this is
@@ -5527,15 +5585,15 @@ should suggest the correct location in the drop down list.</td>
 <div class="paragraph"><p>After selecting the above device name, download the
 dives from the Uemis Zurich. One technical issue with the Uemis Zurich
 download implementation (this is a Uemis firmware limitation, not a
-<em>Subsurface</em> issue) is that one cannot download more than about 40-50
+<em>Subsurface</em> issue) is that you cannot download more than about 40-50
 dives without running out of memory on the SDA. This will usually only
-happen the very first time one downloads dives from the Uemis Zurich.
+happen the very first time you download dives from the Uemis Zurich.
 Normally when downloading at the end of a day or even after a dive
 trip, the capacity is sufficient. If <em>Subsurface</em> displays an error
-that the dive computer ran out of space the solution is straight
-forward.  Disconnect the SDA, turn it off and on again, and reconnect
+that the dive computer ran out of space, the solution is straightforward.
+Disconnect the SDA, turn it off and on again, and reconnect
 it. You can now retry (or start a new download session) and the
-download will continue where it stopped previously. One
+download will continue where it stopped previously. You
 may have to do this more than once, depending on how many dives are
 stored on the dive computer.</p></div>
 </div>
@@ -5561,12 +5619,12 @@ from the console as follows:
 <code>irattach irda0</code></td>
 </tr></table>
 </div>
-<div class="paragraph"><p>After executing this command, Subsurface will recognise the Galileo
+<div class="paragraph"><p>After executing this command, Subsurface will recognize the Galileo
 dive computer and download dive information.</p></div>
 <div class="paragraph"><p>Under Windows, a similar situation exists. Drivers for the MCS7780 are
 available from some Internet web sites e.g.
 <a href="http://www.drivers-download.com/Drv/MosChip/MCS7780/">www.drivers-download.com</a>. Windows-based IrDA
-drivers for the Uwatec can also be downloaded from the ScubaPro web site, drivers being located on
+drivers for the Uwatec can also be downloaded from the ScubaPro web site, with drivers located on
 the download page for the ScubaPro SmartTrak software.</p></div>
 <div class="paragraph"><p>For the Apple Mac, IrDA communication via the MCS7780 link is not
 available for OSX 10.6 or higher.</p></div>
@@ -5607,7 +5665,7 @@ factors in the <em>Graph Settings</em> in <em>Subsurface</em> to generate a deco
 </div>
 </div>
 <div class="sect2">
-<h3 id="_importing_from_shearwater_predator_petrel_using_bluetooth">16.5. Importing from Shearwater Predator/Petrel using Bluetooth</h3>
+<h3 id="_importing_from_shearwater_predator_petrel_nerd_using_bluetooth">16.5. Importing from Shearwater Predator/Petrel/Nerd using Bluetooth</h3>
 <div class="admonitionblock">
 <table><tr>
 <td class="icon">
@@ -5628,8 +5686,8 @@ factors in the <em>Graph Settings</em> in <em>Subsurface</em> to generate a deco
 adapter and the <em>Poseidon PC Configuration Software</em>, obtained when purchasing
 the MKVI equipment. The latter is a Windows application allowing configuration
 of equipment and storage of dive logs. Communication between dive computer and
-desktop computer utilises the IrDA infra-red protocol. Only data for one dive
-can be downloaded at a time, comprising three files:</td>
+desktop computer utilizes the IrDA infra-red protocol. Only data for one dive
+can be downloaded at a time, in three files:</td>
 </tr></table>
 </div>
 <div class="ulist"><ul>
@@ -5651,7 +5709,7 @@ Redbook format dive log (file with .cvsr extension). This is a compressed
 </p>
 </li>
 </ul></div>
-<div class="paragraph"><p><em>Subsurface</em> accesses the .txt and the .csv files to obtain dive log information.</p></div>
+<div class="paragraph"><p><em>Subsurface</em> accesses the .txt and the .csv files to get dive log information.</p></div>
 </div>
 <div class="sect2">
 <h3 id="_importing_from_apd_inspiration_evolution_ccr">16.7. Importing from APD Inspiration/Evolution CCR</h3>
@@ -5707,13 +5765,14 @@ Within <em>Subsurface</em>, select <em>Import &#8594;  Import log files</em> to
 </li>
 <li>
 <p>
-In the dropdown list towards the bottom right of the dialogue (labled <em>Filter:</em>), select "APD log viewer".
+In the dropdown list towards the bottom right of the dialogue (labeled <em>Filter:</em>), select "APD log viewer".
 </p>
 </li>
 <li>
 <p>
-On the list of file names select the <em>.apd</em> file that has been created above. An import
-  dialogue opens indicating the default settings for the data in the <em>.apd</em> file. If any changes are required,
+On the list of file names select the <em>.apd</em> file  created. An import
+  dialogue opens showing the default settings for the data in the
+<em>.apd</em> file. If changes are required,
   do this as for <a href="#S_ImportingCSVDives">CSV imports</a>.
 </p>
 </li>
@@ -5726,7 +5785,7 @@ On the list of file names select the <em>.apd</em> file that has been created ab
 <div class="ulist"><ul>
 <li>
 <p>
-The top left hand dropdown box in the import panel allows one to select the APD dive computer
+The top left hand dropdown box in the import panel lets you select the APD dive computer
   for which the dive log needs to be imported. The default it is DC1, <em>i.e.</em> the
   first of the two dive computers the APD uses. It is possible to sequentially
   import the data for both dive computers by first importing CD1 and then DC2.(<strong>Hint</strong>: The logs
@@ -5740,8 +5799,8 @@ Click the <em>Ok</em> button at the bottom of the import panel.
 </p>
 </li>
 </ul></div>
-<div class="paragraph"><p>The APD dive log will appear within <em>Subsurface</em>. The dive computer-generated ceiling
-generated by the Inspiration can be viewed by selecting the appropriate
+<div class="paragraph"><p>The APD dive log will appear within <em>Subsurface</em>. The dive computer- generated ceiling
+provided by the Inspiration can be viewed by selecting the appropriate
 button on the left of the <strong>Dive Profile</strong>. Cylinder pressure data are not logged
 by the APD equipment but can be manually entered in the <em>Equipment</em> Tab.</p></div>
 </div>
@@ -5876,8 +5935,8 @@ The dives are now exported to the file Divelog.SDE.
 </ol></div>
 <div class="paragraph"><p><strong>Divemanager 4 (DM4) and Divemanager 5 (DM5):</strong></p></div>
 <div class="paragraph"><p>DM4 and DM5 use identical mechanisms for exporting dive logs.
-To export a divelog from Divemanager one needs to locate the DM4/DM5 database
-where the dives are stored. the user can either look for the original
+To export a divelog from Divemanager you need to locate the DM4/DM5 database
+where the dives are stored. You can either look for the original
 database or make a backup of the dives. Both methods are described here.</p></div>
 <div class="paragraph"><p>Locating the Suunto DM4 (or DM5) database:</p></div>
 <div class="olist arabic"><ol class="arabic">
@@ -5898,7 +5957,7 @@ Click <em>Copy</em> after text <em>Copy log folder path to clipboard</em>
 </li>
 <li>
 <p>
-Now open Windows Explorer
+Open Windows Explorer
 </p>
 </li>
 <li>
@@ -5964,28 +6023,28 @@ be directly imported to Subsurface.</td>
 <td class="icon">
 <img src="images/icons/mareslogo.jpg" alt="Note" />
 </td>
-<td class="content">Mares Dive Organiser is a Windows application. The dive log is kept as a
+<td class="content">Mares Dive Organizer is a Windows application. The dive log is kept as a
 Microsoft SQL Compact Edition database with a <em>.sdf</em> filename extension. The
-database includes all Dive Organiser-registered divers on the particular
-computer and all Mares dive computers used. The safest way to obtain a copy
+database includes all Dive Organizer-registered divers on the particular
+computer and all Mares dive computers used. The safest way to get a copy
 of the dive database is to export the information to another compatible format
-which can be imported into <em>Subsurface</em>.</td>
+which can then be imported into <em>Subsurface</em>.</td>
 </tr></table>
 </div>
 <div class="olist arabic"><ol class="arabic">
 <li>
 <p>
-Within Dive Organiser, select
+Within Dive Organizer, select
    <em>Database &#8594;  Backup</em> from the main menu and back up the database to the desk
    top.
-   This creates a zipped file DiveOrganiserxxxxx.dbf.
+   This creates a zipped file DiveOrganizerxxxxx.dbf.
 </p>
 </li>
 <li>
 <p>
 Rename the file to
-   DiveOrganiserxxxxx.zip. Inside the zipped directory is a file
-   <em>DiveOrganiser.sdf</em>.
+   DiveOrganizerxxxxx.zip. Inside the zipped directory is a file
+   <em>DiveOrganizer.sdf</em>.
 </p>
 </li>
 <li>
@@ -6009,12 +6068,12 @@ The password for accessing the .zip file is <em>mares</em>.
 </td>
 <td class="content">The best way to bring your logs from DivingLog to Subsurface is to
 convert the whole database. This is because other export formats do not
-include all the details, and we would lack e.g. gas switches and
+include all the details, and would lack, for example, gas switches and
 information of what units are used. With database import, all this
-information is included and readily available for us.</td>
+information is included and readily available.</td>
 </tr></table>
 </div>
-<div class="paragraph"><p>To transfer all files from DivingLog to Subsurface, do the following:</p></div>
+<div class="paragraph"><p>To transfer all files from DivingLog to Subsurface:</p></div>
 <div class="olist arabic"><ol class="arabic">
 <li>
 <p>
@@ -6043,7 +6102,7 @@ Click <em>Export</em> button and select the filename
 </li>
 </ol></div>
 <div class="paragraph"><p>Once this is done, open the saved database file with Subsurface and the
-dives are automatically converted to our own format. Last step to do is
+dives are automatically converted to Subsurface’s own format. Last step to do is
 save the log file in Subsurface.</p></div>
 </div>
 </div>
@@ -6051,18 +6110,18 @@ save the log file in Subsurface.</p></div>
 <div class="sect1">
 <h2 id="_appendix_d_exporting_a_spreadsheet_to_csv_format">18. APPENDIX D: Exporting a spreadsheet to CSV format</h2>
 <div class="sectionbody">
-<div class="paragraph" id="S_Appendix_D"><p>Many divers keep a diving log in some form of a digital file, commonly a spreadsheet
+<div class="paragraph" id="S_Appendix_D"><p>Many divers keep a dive log in some form of digital file, commonly a spreadsheet
 with various fields of information. These logs can be easily imported into <em>Subsurface</em> after the
 spreadsheet is converted in a .CSV file.
 This section explains the procedure to convert a diving logbook stored in a spreadsheet
-to a .CSV file that will later be imported from <em>Subsurface</em>.
-Creating a .CSV is a straightforward task, although the procedure is somewhat different
+to a .CSV file that will later be imported to <em>Subsurface</em>.
+Creating a .CSV is straightforward, although the procedure is somewhat different
 according to which spreadsheet program is used.</p></div>
-<div class="paragraph"><p>The first step is to organize the diving data in the spreadsheet, so that the first row
+<div class="paragraph"><p>Organize the diving data in the spreadsheet, so the first row
 contains the names (or titles) of each column and the information for each dive is stored in a single row.
-<em>Subsurface</em> supports many data items (Dive #, Date,
+<em>Subsurface</em> supports many data items (Dive number, Date,
 Time, Duration, Location, GPS, Max Depth, Mean Depth, Buddy, Notes, Weight and Tags).
-The user can organize dive data following a few simple rules:</p></div>
+Organize dive data following a few simple rules:</p></div>
 <div class="olist arabic"><ol class="arabic">
 <li>
 <p>
@@ -6076,7 +6135,7 @@ Duration: the format should be minutes:seconds.
 </li>
 <li>
 <p>
-Unit system: only one unit system should be used (i.e., no mixture between imperial and metric units)
+Unit system: only one unit system should be used (no mix of imperial and metric units)
 </p>
 </li>
 <li>
@@ -6086,12 +6145,11 @@ Tags and buddies: values should be separated using a comma.
 </li>
 <li>
 <p>
-GPS position: users must use decimal degrees, e.g. 30.22496 30.821798
+GPS position: use decimal degrees, e.g. 30.22496 30.821798
+=== <em>LibreOffice Calc</em> and <em>OpenOffice Calc</em>
 </p>
 </li>
 </ol></div>
-<div class="sect2">
-<h3 id="_em_libreoffice_calc_em_and_em_openoffice_calc_em">18.1. <em>LibreOffice Calc</em> and <em>OpenOffice Calc</em></h3>
 <div class="paragraph"><p>These are open source spreadsheet applications forming parts of larger open source office suite applications. The user interaction with <em>LibreOffice</em> and <em>OpenOffice</em> is very similar.
 In Libreoffice Calc the time format should be set to minutes:seconds - [mm]:ss and dates should be set to one of: yyyy-mm-dd, dd.mm.yyyy, mm/dd/yyyy. A typical dive log may look like this:</p></div>
 <div class="imageblock" style="text-align:center;">
@@ -6111,18 +6169,17 @@ In Libreoffice Calc the time format should be set to minutes:seconds - [mm]:ss a
 <img src="images/LOffice_field_options.jpg" alt="FIGURE: Field options" />
 </div>
 </div>
-<div class="paragraph"><p>One can double check the .CSV file by opening it with a text editor, and then import the dive data as explained on the section <a href="#S_ImportingCSVDives">Importing CSV dives</a>.</p></div>
-</div>
+<div class="paragraph"><p>Double check the .CSV file by opening it with a text editor, and then import the dive data as explained on the section <a href="#S_ImportingCSVDives">Importing CSV dives</a>.</p></div>
 <div class="sect2">
-<h3 id="_microsoft_em_excel_em">18.2. Microsoft <em>Excel</em></h3>
+<h3 id="_microsoft_em_excel_em">18.1. Microsoft <em>Excel</em></h3>
 <div class="paragraph"><p>The field delimiter (called "<em>list separator</em>" in Microsoft manuals) is not accessible
 from within <em>Excel</em> and needs to be set through the <em>Microsoft Control Panel</em>. After changing the
-separator character, all software on the Windows machine use the new character as a separator.
-One can change the character back to the default character by following the same procedure, outlined below.</p></div>
+separator character, all software on the Windows machine uses the new character as a separator.
+You can change the character back to the default character by following the same procedure, outlined below.</p></div>
 <div class="ulist"><ul>
 <li>
 <p>
-In Microsoft Windows, click the <strong>Start</strong> button, and then select <em>Control Panel</em> from the list on the right-hand side.
+In Microsoft Windows, click the <strong>Start</strong> button, then select <em>Control Panel</em> from the list on the right-hand side.
 </p>
 </li>
 <li>
@@ -6171,21 +6228,27 @@ Click <em>OK</em> twice.
 <img src="images/Win_SaveCSV1.jpg" alt="FIGURE: Excel save as option" />
 </div>
 </div>
-<div class="paragraph"><p>Click on the left-hand part of the <em>Save as</em> option, NOT on the arrow on the right-hand. This brings up a dialogue for saving the spreadsheet in an alternative format. From the dropdown list at the bottom of the dialogue, marked <em>Save as Type:</em>, select <em>CSV(Comma delimited) (*.CSV)</em>. Ensure that the appropriate folder has been selected to save the CSV file into.</p></div>
+<div class="paragraph"><p>Click on the left-hand part of the <em>Save as</em> option, NOT on the arrow on the right-hand. This brings up a dialogue for saving the
+spreadsheet in an alternative format. From the dropdown list at the
+bottom of the dialogue, marked <em>Save as Type:</em>, select <em>CSV(Comma delimited) (*.CSV)</em>. Be sure the appropriate folder has been
+selected to save the CSV file into.</p></div>
 <div class="imageblock" style="text-align:center;">
 <div class="content">
 <img src="images/Win_SaveCSV3.jpg" alt="FIGURE: Excel save CSV dialogue" />
 </div>
 </div>
-<div class="paragraph"><p>Select the <em>Save</em> button. The CSV-formatted file is saved into the folder that was selected. One can double check the .CSV file by opening it with a text editor, and then import the dive data as explained on the section <a href="#S_ImportingCSVDives">Importing CSV dives</a>.</p></div>
+<div class="paragraph"><p>Select the <em>Save</em> button. The CSV-formatted file is saved into the
+folder that was selected. You can double check the .CSV file by
+opening it with a text editor, then import the dive data as
+explained on the section <a href="#S_ImportingCSVDives">Importing CSV dives</a>.</p></div>
 </div>
 </div>
 </div>
 <div class="sect1">
 <h2 id="S_APPENDIX_E">19. APPENDIX E: Writing a custom print template</h2>
 <div class="sectionbody">
-<div class="paragraph"><p><em>Subsurface</em> provides a mechanism to create or modify templates for printing dive logs in order to
-produce customised printouts of dive logs. Templates, written in HTML as well as a simple
+<div class="paragraph"><p><em>Subsurface</em> has a way to create or modify templates for printing dive logs to
+produce customized printouts of them. Templates written in HTML, as well as a simple
 Grantlee instruction set, are rendered to the print device by <em>Subsurface</em>.</p></div>
 <div class="paragraph"><p>Templates are accessed using the print dialogue (see image <strong>B</strong> below).</p></div>
 <div class="imageblock" style="text-align:center;">
@@ -6193,43 +6256,44 @@ Grantlee instruction set, are rendered to the print device by <em>Subsurface</em
 <img src="images/Print1_f22.jpg" alt="FIGURE: Print dialogue" />
 </div>
 </div>
-<div class="paragraph"><p>The buttons under the <em>Template</em> dropdown box allows one to <em>Edit</em>, <em>Delete</em>,
-<em>Import</em> and to <em>Export</em> templates (see image <strong>A</strong> above). New or modified templates are stored as HTML
+<div class="paragraph"><p>The buttons under the <em>Template</em> dropdown box lets you <em>Edit</em>, <em>Delete</em>,
+<em>Import</em> and  <em>Export</em> templates (see image <strong>A</strong> above). New or modified templates are stored as HTML
 files in the same directory as the dive log being processed. In order to create or modify
 a template, select one of the templates from the template dropdown list in the print dialogue
 (see image <strong>B</strong> above). Choose an existing template that resembles the final desired printout. Then select <em>Edit</em>.</p></div>
-<div class="paragraph"><p>The Edit Panel comprises three tabs:</p></div>
+<div class="paragraph"><p>The Edit Panel has three tabs:</p></div>
 <div class="imageblock" style="text-align:center;">
 <div class="content">
 <img src="images/Template1_f22.jpg" alt="FIGURE: template edit dialogue" />
 </div>
 </div>
-<div class="paragraph"><p>1) The <em>Style</em> tab (image <strong>A</strong> above) controls the font, line spacing and colour template used for printing the dive log.
-   The style attributes are editable. Choose one of the four colour palets used for colour printing.</p></div>
-<div class="paragraph"><p>2) The <em>Colors</em> tab (image <strong>B</strong> above) allows editing the colours used for printing the dive log. The colours are highly
-   customisable: the <em>Edit</em> buttons in the <em>Colors</em> tab allows choosing abritrary colours for different
+<div class="paragraph"><p>1) The <em>Style</em> tab (image <strong>A</strong> above) controls the font, line spacing and color template used for printing the dive log.
+   The style attributes are editable. Choose one of the four color palettes used for color printing.</p></div>
+<div class="paragraph"><p>2) The <em>Colors</em> tab (image <strong>B</strong> above) allows editing the colors used for printing the dive log. The colors are highly
+   customizable: the <em>Edit</em> buttons in the <em>Colors</em> tab allows choosing arbitrary colors for different
    components of the dive log printout.</p></div>
 <div class="paragraph"><p>3) The <em>Template</em> tab of the Edit Panel (see image below) allows creating a template using HTML as well as a few
-   Grantlee programming primitives. Grantlee provides the ability to create and format HTML code in
+   Grantlee programming primitives. Grantlee can create and format HTML code in
    a highly simple but efficient way (see below). The HTML of the template can be edited and saved. The saved
    template is stored in the same directory as the dive being processed. By default, a <em>Custom</em>
-   template is a skeleton with no specific print instructions. The informastion being printed
-   needs to be specified and formatted in the by replacing the section marked with:
+   template is a skeleton with no specific print instructions. The information printed
+   needs to be specified and formatted in the template by replacing the section marked with:
    "&lt;!-- Template must be filled -&#8594;". Writing HTML code with Grantlee instructions allows unlimited
-   freedom in determining what is printed an in which way it should be rendered.</p></div>
+   freedom in determining what is printed and in which way it should be rendered.</p></div>
 <div class="imageblock" style="text-align:center;">
 <div class="content">
 <img src="images/Template2_f22.jpg" alt="FIGURE:Template tab" />
 </div>
 </div>
-<div class="paragraph"><p>One can adapt any of the existing templates and save it to the dive log directory. The standard templates (e.g. One dive, Six dives, Table) can be modified in this way. After completing the edits, use the <em>Export</em> button in the print
+<div class="paragraph"><p>You can adapt any of the existing templates and save it to the dive log directory. The standard templates (e.g. One dive, Six dives,
+Table) can be modified in this way. After completing the edits, use the <em>Export</em> button in the print
 dialogue to save the new template using a new template name.</p></div>
-<div class="paragraph"><p>To write a custom template the following elements must exist so that the template will be correctly handled and rendered.</p></div>
+<div class="paragraph"><p>To write a custom template, the following elements must exist so  the template will be correctly handled and rendered.</p></div>
 <div class="sect2">
 <h3 id="_main_dive_loop">19.1. Main dive loop</h3>
-<div class="paragraph"><p><em>Subsurface</em> exports a dive list called (<strong>dives</strong>) to the <em>Grantlee</em> backend. It is possible to iterate over the list as follows:</p></div>
+<div class="paragraph"><p><em>Subsurface</em> exports a dive list called (<strong>dives</strong>) to the <em>Grantlee</em> back end. It is possible to iterate over the list as follows:
+.template.html</p></div>
 <div class="literalblock">
-<div class="title">template.html</div>
 <div class="content">
 <pre><code>        {% for dive in dives %}
                 &lt;h1&gt; {{ dive.number }} &lt;/h1&gt;
@@ -6242,7 +6306,7 @@ dialogue to save the new template using a new template name.</p></div>
         &lt;h1&gt; 2 &lt;/h1&gt;
         &lt;h1&gt; 3 &lt;/h1&gt;</code></pre>
 </div></div>
-<div class="paragraph"><p>Additional information about <em>Grantlee</em> can be found <a href="http://www.grantlee.org/apidox/for_themers.html">here</a></p></div>
+<div class="paragraph"><p>Additional information about <em>Grantlee</em> can be found at <a href="http://www.grantlee.org/apidox/for_themers.html">here</a></p></div>
 </div>
 <div class="sect2">
 <h3 id="_grantlee_exported_variables">19.2. Grantlee exported variables</h3>
@@ -6269,7 +6333,7 @@ cellspacing="0" cellpadding="4">
 </tr>
 <tr>
 <td align="left" valign="top"><p class="table">date</p></td>
-<td align="left" valign="top"><p class="table">(<strong>string</strong>) data of the dive</p></td>
+<td align="left" valign="top"><p class="table">(<strong>string</strong>) date of the dive</p></td>
 </tr>
 <tr>
 <td align="left" valign="top"><p class="table">time</p></td>
@@ -6289,19 +6353,19 @@ cellspacing="0" cellpadding="4">
 </tr>
 <tr>
 <td align="left" valign="top"><p class="table">divemaster</p></td>
-<td align="left" valign="top"><p class="table">(<strong>string</strong>) divemaster data</p></td>
+<td align="left" valign="top"><p class="table">(<strong>string</strong>) dive master for the dive</p></td>
 </tr>
 <tr>
 <td align="left" valign="top"><p class="table">buddy</p></td>
-<td align="left" valign="top"><p class="table">(<strong>string</strong>) buddy data</p></td>
+<td align="left" valign="top"><p class="table">(<strong>string</strong>) buddy for the dive</p></td>
 </tr>
 <tr>
 <td align="left" valign="top"><p class="table">airTemp</p></td>
-<td align="left" valign="top"><p class="table">(<strong>string</strong>) air temperature of dive</p></td>
+<td align="left" valign="top"><p class="table">(<strong>string</strong>) air temperature of the dive</p></td>
 </tr>
 <tr>
 <td align="left" valign="top"><p class="table">waterTemp</p></td>
-<td align="left" valign="top"><p class="table">(<strong>string</strong>) water temperature of dive</p></td>
+<td align="left" valign="top"><p class="table">(<strong>string</strong>) water temperature of the dive</p></td>
 </tr>
 <tr>
 <td align="left" valign="top"><p class="table">notes</p></td>
@@ -6309,19 +6373,47 @@ cellspacing="0" cellpadding="4">
 </tr>
 <tr>
 <td align="left" valign="top"><p class="table">rating</p></td>
-<td align="left" valign="top"><p class="table">(<strong>int</strong>) dive rating ranges from 0 to 5</p></td>
+<td align="left" valign="top"><p class="table">(<strong>int</strong>) dive rating which ranges from 0 to 5</p></td>
 </tr>
 <tr>
 <td align="left" valign="top"><p class="table">sac</p></td>
-<td align="left" valign="top"><p class="table">(<strong>string</strong>) sac value</p></td>
+<td align="left" valign="top"><p class="table">(<strong>string</strong>) SAC value for the dive</p></td>
 </tr>
 <tr>
 <td align="left" valign="top"><p class="table">tags</p></td>
-<td align="left" valign="top"><p class="table">(<strong>string</strong>) all dive tags concatenate together</p></td>
+<td align="left" valign="top"><p class="table">(<strong>string</strong>) list of dive tags for the dive</p></td>
 </tr>
 <tr>
 <td align="left" valign="top"><p class="table">gas</p></td>
-<td align="left" valign="top"><p class="table">(<strong>string</strong>) used gas cylinder</p></td>
+<td align="left" valign="top"><p class="table">(<strong>string</strong>) list of gases used in the dive</p></td>
+</tr>
+<tr>
+<td align="left" valign="top"><p class="table">suit</p></td>
+<td align="left" valign="top"><p class="table">(<strong>string</strong>) the suit used for the dive</p></td>
+</tr>
+<tr>
+<td align="left" valign="top"><p class="table">cylinders</p></td>
+<td align="left" valign="top"><p class="table">(<strong>string</strong>) complete information of all used cylinders</p></td>
+</tr>
+<tr>
+<td align="left" valign="top"><p class="table">cylinder0-7</p></td>
+<td align="left" valign="top"><p class="table">(<strong>string</strong>) information about a specific cylinder</p></td>
+</tr>
+<tr>
+<td align="left" valign="top"><p class="table">weights</p></td>
+<td align="left" valign="top"><p class="table">(<strong>string</strong>) complete information of all used weight systems</p></td>
+</tr>
+<tr>
+<td align="left" valign="top"><p class="table">weight0-5</p></td>
+<td align="left" valign="top"><p class="table">(<strong>string</strong>) information about a specific weight system</p></td>
+</tr>
+<tr>
+<td align="left" valign="top"><p class="table">maxcns</p></td>
+<td align="left" valign="top"><p class="table">(<strong>string</strong>) maxCNS value for the dive</p></td>
+</tr>
+<tr>
+<td align="left" valign="top"><p class="table">otu</p></td>
+<td align="left" valign="top"><p class="table">(<strong>string</strong>) OTU value for the dive</p></td>
 </tr>
 </tbody>
 </table>
@@ -6430,7 +6522,7 @@ cellspacing="0" cellpadding="4">
 </div>
 <div class="sect2">
 <h3 id="_defined_css_selectors">19.3. Defined CSS selectors</h3>
-<div class="paragraph"><p>As the dive profile is placed after rendering, <em>Subsurface</em> uses a special <em>CSS</em> selectors to do some searches
+<div class="paragraph"><p>As the dive profile is placed after rendering, <em>Subsurface</em> uses special <em>CSS</em> selectors to searche
 in the HTML output. The <em>CSS</em> selectors in the following table should be added.</p></div>
 <div class="tableblock">
 <table rules="all"
@@ -6454,12 +6546,12 @@ cellspacing="0" cellpadding="4">
 <tr>
 <td align="left" valign="top"><p class="table">diveProfile</p></td>
 <td align="left" valign="top"><p class="table">class</p></td>
-<td align="left" valign="top"><p class="table">each div that will contain a dive profile should have this class selector in addition to the dive_{{ dive.id }} id selector</p></td>
+<td align="left" valign="top"><p class="table">each dive that will contain a dive profile should have this class selector in addition to the dive_{{ dive.id }} id selector</p></td>
 </tr>
 <tr>
 <td align="left" valign="top"><p class="table">dontbreak</p></td>
 <td align="left" valign="top"><p class="table">class</p></td>
-<td align="left" valign="top"><p class="table">prevents the div with this class to be divided into two pages, this can be used
+<td align="left" valign="top"><p class="table">prevents the dive with this class from being divided into two pages. This can be used
 in flow layout templates only (when data-numberofdives = 0)</p></td>
 </tr>
 </tbody>
@@ -6477,8 +6569,8 @@ in flow layout templates only (when data-numberofdives = 0)</p></td>
 <div class="sect2">
 <h3 id="_special_attributes">19.4. Special attributes</h3>
 <div class="paragraph"><p>There are two ways of rendering- either rendering a specific number of dives in each page or make <em>Subsurface</em> try to
-fit as much dives as possible into one page (<em>flow</em> rendering).</p></div>
-<div class="paragraph"><p>The <strong>data-numberofdives</strong> data attribute is added to the body tag to set the rendering mode</p></div>
+fit as many dives as possible into one page (<em>flow</em> rendering).</p></div>
+<div class="paragraph"><p>The <strong>data-numberofdives</strong> data attribute is added to the body tag to set the rendering mode.</p></div>
 <div class="ulist"><ul>
 <li>
 <p>
@@ -6522,7 +6614,7 @@ miscalculating?</p></div>
 <div class="paragraph"><p><em>Answer</em>: Not really. What happens is that <em>Subsurface</em> actually calculates gas
 consumption differently - and better - than you expect.
 In particular, it takes the incompressibility of the gas into account.
-Traditionally, Gas consumption and SAC should be:
+Traditionally, gas consumption and SAC should be:
 <code>consumption = tank size x (start pressure - end pressure)</code></p></div>
 <div class="paragraph"><p>and that&#8217;s true for an ideal gas, and it&#8217;s what you get taught in dive theory.
 But an "ideal gas" doesn&#8217;t actually exist, and real gases actually don&#8217;t compress
@@ -6560,21 +6652,21 @@ you don&#8217;t want that to count as some kind of long dive”.</p></div>
 </div>
 <div class="sect2">
 <h3 id="_some_dive_profiles_are_missing_from_the_download">20.3. Some dive profiles are missing from the download</h3>
-<div class="paragraph" id="DC_HISTORY"><p><em>Question</em>: I cannot download all my dives, only the most recent ones
+<div class="paragraph" id="DC_HISTORY"><p><em>Question</em>: I cannot download all my dives, only the most recent ones,
 even though my dive computer&#8217;s manual states that it records history of
-e.g. 999 dives.</p></div>
-<div class="paragraph"><p><em>Answer</em>: Dive history is different than the dive profiles on the log.
+e.g. 999 dives?
+<em>Answer</em>: Dive history is different than the dive profiles on the log.
 The history only keeps track of the total number of dives and total
 amount of time spent below surface. The logs, on the other hand, store
-the dive profile, but they have limited amount of memory to do so. The
-exact amount of dive profiles that can be stored on the device depend on
+the dive profile, but they have a limited amount of memory to do so. The
+exact amount of dive profiles that can be stored on the device depends on
 sample interval and duration of the dives. Once the memory is full the
 oldest dives get overwritten with new dives. Thus we are only able to
 download the last 13, 30 or 199 dives.</p></div>
 <div class="paragraph"><p>If you have downloaded your dives to different dive logging software
-before they were overwritten, there is a high chance that Subsurface can
+before they were overwritten, there is a good 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>
+cannot be salvaged after being overwritten by new dives.</p></div>
 </div>
 </div>
 </div>
@@ -6582,7 +6674,7 @@ cannot be 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-14 05:50:27 PDT
+Last updated 2015-12-16 06:35:54 PST
 </div>
 </div>
 </body>
diff --git a/Documentation/user-manual_es.html.git b/Documentation/user-manual_es.html.git
index 0fc59bd90..c1dac8401 100644
--- a/Documentation/user-manual_es.html.git
+++ b/Documentation/user-manual_es.html.git
@@ -202,6 +202,40 @@ ol.upperroman               { list-style-type: upper-roman; }
 .hdlist td                  { vertical-align: top; }
 
 
+@media screen {
+  body {
+    max-width: 50em; /* approximately 80 characters wide */
+    margin-left: 16em;
+  }
+
+  #toc {
+    position: fixed;
+    top: 0;
+    left: 0;
+    bottom: 0;
+    width: 13em;
+    padding: 0.5em;
+    padding-bottom: 1.5em;
+    margin: 0;
+    overflow: auto;
+    border-right: 3px solid #f8f8f8;
+    background-color: white;
+  }
+
+  #toc .toclevel1 {
+    margin-top: 0.5em;
+  }
+
+  #toc .toclevel2 {
+    margin-top: 0.25em;
+    display: list-item;
+    color: #aaaaaa;
+  }
+
+  #toctitle {
+    margin-top: 0.5em;
+  }
+}
 </style>
 <script type="text/javascript">
 /*<![CDATA[*/
@@ -414,7 +448,7 @@ Pedro Neves</p></div>
 <div class="paragraph"><p><span class="BLUE"><em>Versión 4.5, Septiembre 2015</em></span></p></div>
 <div class="paragraph"><p>Bienvenido como usuario de <em>Subsurface</em>, un avanzado programa de registro de
 inmersiones con extensa infraestructura para describir, organizar e
-interpretarbuceos en apnea o con botella. <em>Subsurface</em> ofrece muchas ventajas
+interpretar buceos en apnea o con botella. <em>Subsurface</em> ofrece muchas ventajas
 sobre otras soluciones de software similares:</p></div>
 <div class="ulist"><ul>
 <li>
@@ -479,16 +513,46 @@ Buceadores profesionales.</p></div>
   <noscript><p><b>JavaScript must be enabled in your browser to display the table of contents.</b></p></noscript>
 </div>
 <div class="sect1">
-<h2 id="S_UserSurvey">1. Utilizar este manual</h2>
+<h2 id="_utilizar_este_manual">1. Utilizar este manual</h2>
 <div class="sectionbody">
 <div class="paragraph"><p>Cuando se abre desde dentro de <em>Subsurface</em> este manual no tiene controles
-externos. Sin embargo, una función <em>BUSCAR</em> es importante. Se activa pulsando
-control-F en el teclado. Aparecerá una ventana de texto al pié de la ventana.
-Utilízala para buscar cualquier término en el manual.</p></div>
+externos para paginar o seleccionar páginas anteriores, sin embargo se
+proporcionan dos utilidades:</p></div>
+<div class="ulist"><ul>
+<li>
+<p>
+La función <em>BUSCAR</em> se activa pulsando control-F o command-F en el teclado.
+Aparecerá una ventana de texto al pié de la ventana (ver imagen a continuación).
+Por ejemplo, si se tecleó la palabra "<em>lastre</em>" en la casilla de búsqueda, se
+buscará esta palabra por todo el manual. A la derecha de la casilla de texto
+hay dos flechas, una hacia arriba y otra hacia abajo. Pulsándolas se irá a la
+anterior o posterior aparición de la palabra buscada.
+</p>
+</li>
+</ul></div>
+<div class="imageblock" style="text-align:center;">
+<div class="content">
+<img src="images/usermanualfunctions.jpg" alt="User manual functions" />
+</div>
+</div>
+<div class="ulist"><ul>
+<li>
+<p>
+<em>LINK ANTERIOR/POSTERIOR</em>. Se puede navegar entre links (palabras resaltadas
+que permiten saltar a secciones específicas del manual) haciendo clic-derecho
+en el texto. Esto muestra un menú contextual que permite navegar a links
+del manual visitados anteriormente (ver imagen anterior). Por ejemplo, si se
+ha seleccionado un link del manual, la opción <em>Atrás</em> muestra el texto del
+último link seleccionado. A la inversa, la opción <em>Adelante</em> permite saltar
+al texto visitado antes de usar la opción <em>Atrás</em>. La opción <em>Recargar</em> hace
+que se recargue el manual completo en la ventana.
+</p>
+</li>
+</ul></div>
 </div>
 </div>
 <div class="sect1">
-<h2 id="_la_encuesta_de_usuarios">2. La Encuesta de Usuarios</h2>
+<h2 id="S_UserSurvey">2. La Encuesta de Usuarios</h2>
 <div class="sectionbody">
 <div class="paragraph"><p>Para poder desarrollar <em>Subsurface</em> de una forma que sirva a sus usuarios de la
 mejor manera posible, es importante tener alguna información de los mismos.  Al
@@ -1021,8 +1085,12 @@ izquierda del diálogo (ver imagen anterior). Si no es así, pulsa el botón,
 <em>Subsurface</em> "ve" el ordenador de buceo, la línea de la lista contendrá el
 nombre del dispositivo, su dirección y su estado de emparejamiento. Si el
 dispositivo no está emparejado y tiene un fondo rojo, se puede abrir un menú
-contextual seleccionando su línea y pulsando clic-derecho. Pulsa el
-botón <em>Emparejar</em> y espera a que se complete la tarea.</p></div>
+contextual seleccionando su línea y pulsando clic-derecho.
+Pulsa el botón <em>Emparejar</em> y espera a que se complete la tarea. Si este
+ordenador de buceo se está emparejando con <em>Subsurface</em> por primera vez, es
+posible que se requiera una clave o número PIN. La clave más utilizada suele
+ser 0000, y funciona para el Shearwater Petrel. En caso necesario, consulta el
+manual de usuario del ordenador de buceo.</p></div>
 <div class="sidebarblock">
 <div class="content">
 <div class="admonitionblock">
@@ -1065,7 +1133,11 @@ descargado se mostrarán en el lado derecho de la ventana de descarga.</p></div>
 <div class="paragraph"><p>En plataformas Windows no está disponible la <em>sección de detalles de los
 dispositivos Bluetooth</em>. Para iniciar correctamente un escaneo pulsando el
 botón <em>Buscar</em> , comprueba que el dispositivo <em>Bluetooth</em> del ordenador con
-<em>Subsurface</em> está activado.</p></div>
+<em>Subsurface</em> está activado seleccionando el ordenador de la lista de
+dispositivos Bluetooth disponibles (ver imagen anterior). Si se accede por
+primera vez al ordenador de buceo con <em>Subsurface</em>, es posible que se
+requiera una clave/PIN. Introduce el recomendado en el manual de ordenador
+de buceo.  A menudo es correcto un pin 0000.</p></div>
 <div class="paragraph"><p>El paso del emparejado se efectúa de forma
 automática durante el proceso de descarga. Si los dispositivos no se han
 emparejado nunca, el sistema te pedirá permiso y mostrará un mensaje en el
@@ -1082,7 +1154,8 @@ proceso.</p></div>
 <td class="content">Hay que tener en cuenta que, actualmente, <em>Subsurface</em> solo funciona con
 adaptadores Bluetooth locales que usen Microsoft Bluetooth Stack. Si el
 dispositivo local usa drivers <em>Widcomm</em>, <em>Stonestreet One Bluetopia Bluetooth</em> o
-<em>BlueSolei</em> no funcionará.</td>
+<em>BlueSolei</em> no funcionará, sin embargo, los receptores de estos fabricantes
+que usen el Microsoft Bluetooth Stack sí funcionarán.</td>
 </tr></table>
 </div>
 <div class="paragraph"><p>Un mensaje de aviso en la parte inferior izquierda de la <em>Selección de
@@ -2818,10 +2891,10 @@ oxígeno (OTU) en las que se ha incurrido.</p></div>
 <td class="icon">
 <img src="images/icons/info.jpg" alt="Note" />
 </td>
-<td class="content">Consumo de gas y cálculos de CAS <em>Subsurface</em> calcula el CAS y el consumo de gas
+<td class="content">Consumo de gas y cálculos de CAS: <em>Subsurface</em> calcula el CAS y el consumo de gas
 teniendo en cuenta la incompresibilidad de los gases, particularmente a
 presiones en las botellas superiores a 200 bar, haciéndolos más precisos. Los
-usuarios deberían consultar el <a href="#SAC_CALCULATION">Apéndice_D</a> para más información.</td>
+usuarios deberían consultar el <a href="#SAC_CALCULATION">Apéndice F</a> para más información.</td>
 </tr></table>
 </div>
 </div>
@@ -3225,6 +3298,24 @@ oxígeno.</td>
 <div class="admonitionblock">
 <table><tr>
 <td class="icon">
+<img src="images/icons/NDL.jpg" alt="Note" />
+</td>
+<td class="content">Activar este botón hace que el recuadro Información muestre, bien el <strong>Límite
+de no descompresión (LND)</strong> o el <strong>*Tiempo total hasta superficie (TTS)</strong>. El
+LND es el tiempo que un buzo puede permanecer sumergido a la profundidad actual
+sin requerir descompresión (esto es, sin que aparezca un techo para el ascenso).
+Una vez que se ha excedido el LND y se requiere descompresión, el TTS incluirá
+el total de minutos requeridos antes de que el buceador pueda salir a superficie.
+El TTS incluye el tiempo de ascenso y las paradas de descompresión. Se calcula
+suponiendo que se usa el gas actual. Incluso si el perfil incluye varios
+cambios de gas, el TTS en un momento dado de la inmersión se habrá calculado
+con el gas en uso en ese momento. Para TTS superiores a 2 horas, no se calcula
+con precisión y simplemente se indica <em>TTS &gt; 2h</em>.</td>
+</tr></table>
+</div>
+<div class="admonitionblock">
+<table><tr>
+<td class="icon">
 <img src="images/icons/SAC.jpg" alt="Note" />
 </td>
 <td class="content">Activar este botón hace que el Recuadro de información muestre el <strong>Consumo de
@@ -5448,7 +5539,7 @@ conectarse y se debería poder importar las inmersiones.</p></div>
 <img src="images/icons/bluetooth.jpg" alt="Note" />
 </td>
 <td class="content">Para ordenadores de buceo que se comunican por bluetooth como el Heinrichs
-Weikamp Frog o el Shearwater Predator y Petrel hay un procedimiento distinto
+Weikamp Frog o el Shearwater Predator, Petrel y Nerd hay un procedimiento distinto
 para localizar los nombres de dispositivo con los que se comunicará
 <em>Subsurface</em>. En general consiste en estos pasos:</td>
 </tr></table>
@@ -5462,7 +5553,7 @@ modo Upload</strong>
 </li>
 </ul></div>
 <div class="paragraph"><p>Para emparejar el ordenador de buceo, consulta la guía de usuario del
-fabricante. Si se está usando un Shearwater Predator/Petrel, hay que seleccionar
+fabricante. Si se está usando un Shearwater Predator/Petrel/Nerd, hay que seleccionar
 <em>Dive Log → Upload Log</em> y esperar al mensaje <em>Wait PC</em>.</p></div>
 <div class="ulist"><ul>
 <li>
@@ -5530,7 +5621,7 @@ Descargar las inmersiones con <em>Subsurface</em>
 </li>
 </ul></div>
 <div class="paragraph"><p>Asegurarse de que el ordenador de buceo está en modo "upload". En el <em>Petrel</em>
-y <em>Petrel 2</em>, navega por el menú, selecciona <em>Dive Log</em>, luego <em>Upload log</em>. En
+y <em>Petrel 2</em> y <em>Nerd</em>, navega por el menú, selecciona <em>Dive Log</em>, luego <em>Upload log</em>. En
 la pantalla se leerá <em>Initializing</em>, luego <em>Wait PC 3:00</em> e iniciará una cuenta
 atrás. Una vez que la conexión esté establecida, en la pantalla se leerá
 <em>Wait CMD &#8230;</em> y la cuenta atrás seguirá. Cuando se descargue la inmersión a
@@ -5659,12 +5750,17 @@ probablemente sea:</p></div>
 <div class="ulist"><ul>
 <li>
 <p>
+<em>Shearwater Petrel 1</em>: channel 1
+</p>
+</li>
+<li>
+<p>
 <em>Shearwater Petrel 2</em>: channel 5
 </p>
 </li>
 <li>
 <p>
-<em>Shearwater Petrel 1</em>: channel 1
+<em>Shearwater Nerd</em>: channel 5
 </p>
 </li>
 <li>
@@ -5831,7 +5927,7 @@ mostraría el xDEEP BLACK.</td>
 </div>
 </div>
 <div class="sect2">
-<h3 id="_importar_del_shearwater_predator_petrel_usando_bluetooth">17.5. Importar del Shearwater Predator/Petrel usando Bluetooth</h3>
+<h3 id="_importar_del_shearwater_predator_petrel_nerd_usando_bluetooth">17.5. Importar del Shearwater Predator/Petrel/Nerd usando Bluetooth</h3>
 <div class="admonitionblock">
 <table><tr>
 <td class="icon">
@@ -6852,7 +6948,7 @@ sido sobrescritos.</p></div>
 <div id="footnotes"><hr /></div>
 <div id="footer">
 <div id="footer-text">
-Last updated 2015-10-13 19:18:28 PDT
+Last updated 2015-12-15 13:35:29 PST
 </div>
 </div>
 </body>
diff --git a/Documentation/user-manual_fr.html.git b/Documentation/user-manual_fr.html.git
index ef439f0c8..205167523 100644
--- a/Documentation/user-manual_fr.html.git
+++ b/Documentation/user-manual_fr.html.git
@@ -1,12 +1,12 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
     "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">
-<head>
-<meta http-equiv="Content-Type" content="application/xhtml+xml; charset=UTF-8" />
-<meta name="generator" content="AsciiDoc 8.6.8" />
-<title></title>
-<style type="text/css">
-/*
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">
+<head>
+<meta http-equiv="Content-Type" content="application/xhtml+xml; charset=UTF-8" />
+<meta name="generator" content="AsciiDoc 8.6.9" />
+<title></title>
+<style type="text/css">
+/*
  * compact_subsurface.css, a special style sheet for Subsurface,
  *  modified by Willem Ferguson and derived from:
  *		compact.css, version 1.3 by Alex Efros <powerman@powerman.name>
@@ -199,46 +199,46 @@ ol.loweralpha               { list-style-type: lower-alpha; }
 ol.upperalpha               { list-style-type: upper-alpha; }
 ol.lowerroman               { list-style-type: lower-roman; }
 ol.upperroman               { list-style-type: upper-roman; }
-.hdlist td                  { vertical-align: top; }
-
-
-@media screen {
-  body {
-    max-width: 50em; /* approximately 80 characters wide */
-    margin-left: 16em;
-  }
-
-  #toc {
-    position: fixed;
-    top: 0;
-    left: 0;
-    bottom: 0;
-    width: 13em;
-    padding: 0.5em;
-    padding-bottom: 1.5em;
-    margin: 0;
-    overflow: auto;
-    border-right: 3px solid #f8f8f8;
-    background-color: white;
-  }
-
-  #toc .toclevel1 {
-    margin-top: 0.5em;
-  }
-
-  #toc .toclevel2 {
-    margin-top: 0.25em;
-    display: list-item;
-    color: #aaaaaa;
-  }
-
-  #toctitle {
-    margin-top: 0.5em;
-  }
-}
-</style>
-<script type="text/javascript">
-/*<![CDATA[*/
+.hdlist td                  { vertical-align: top; }
+
+
+@media screen {
+  body {
+    max-width: 50em; /* approximately 80 characters wide */
+    margin-left: 16em;
+  }
+
+  #toc {
+    position: fixed;
+    top: 0;
+    left: 0;
+    bottom: 0;
+    width: 13em;
+    padding: 0.5em;
+    padding-bottom: 1.5em;
+    margin: 0;
+    overflow: auto;
+    border-right: 3px solid #f8f8f8;
+    background-color: white;
+  }
+
+  #toc .toclevel1 {
+    margin-top: 0.5em;
+  }
+
+  #toc .toclevel2 {
+    margin-top: 0.25em;
+    display: list-item;
+    color: #aaaaaa;
+  }
+
+  #toctitle {
+    margin-top: 0.5em;
+  }
+}
+</style>
+<script type="text/javascript">
+/*<![CDATA[*/
 var asciidoc = {  // Namespace.
 
 /////////////////////////////////////////////////////////////////////
@@ -517,43 +517,43 @@ logicielles.</p></div>
 professionnels</p></div>
 <div id="toc">
   <div id="toctitle">Table of Contents</div>
-  <noscript><p><b>JavaScript must be enabled in your browser to display the table of contents.</b></p></noscript>
-</div>
-<div class="sect1">
-<h2 id="_utilisation_de_ce_manuel">1. Utilisation de ce manuel</h2>
-<div class="sectionbody">
-<div class="paragraph"><p>When opened from within <em>Subsurface</em>, this manual does not have external
-controls for paging or selecting previous pages. However, two facilities are
-provided:</p></div>
-<div class="paragraph"><p>The <em>SEARCH</em> function is activated by pressing control-F or command-F on the
-keyboard. A text box appears at the bottom right-hand of the window (see
-image below).  For instance, if one typed the word "<em>weights</em>" into the
-search text box, this word will be searched for throughout this user
-manual. To the right of the search text box are two arrows pointing upwards
-and downwards. Selecting these allow finding, respectively, the previous and
-the next occurence of the term being searched for.</p></div>
-<div class="imageblock" style="text-align:center;">
-<div class="content">
-<img src="images/usermanualfunctions.jpg" alt="User manual functions" />
-</div>
-</div>
-<div class="paragraph"><p><em>PREVIOUS/NEXT LINK</em>. One can move between links (underlined words allowing
-one to jump to specific sections in this user manual) by right-clicking on
-the text of the manual.  This brings up a context menu for jumping to
-previous links selected while reading the manual (see image above). For
-instance if a link in the manual has been selected, then the option to <em>Go
-Back</em> shows the text at the last link that was selected (similar to the
-Previous Page button in a browser). Conversely the <em>Go Forward</em> option
-enables jumping to the text perused before selecting the <em>Go Back</em>
-option. The <em>Reload</em> option causes the complete user manual to be reloaded
-into the user manual window.</p></div>
-</div>
-</div>
-<div class="sect1">
-<h2 id="S_UserSurvey">2. Le sondage utilisateur</h2>
-<div class="sectionbody">
-<div class="paragraph"><p>Dans le but de développer <em>Subsurface</em> d&#8217;une manière qui serve ses
-utilisateurs de la meilleur manière qu&#8217;il soit, il est important d&#8217;avoir des
+  <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="_utilisation_de_ce_manuel">1. Utilisation de ce manuel</h2>
+<div class="sectionbody">
+<div class="paragraph"><p>When opened from within <em>Subsurface</em>, this manual does not have external
+controls for paging or selecting previous pages. However, two facilities are
+provided:</p></div>
+<div class="paragraph"><p>The <em>SEARCH</em> function is activated by pressing control-F or command-F on the
+keyboard. A text box appears at the bottom right-hand of the window (see
+image below).  For instance, if one typed the word "<em>weights</em>" into the
+search text box, this word will be searched for throughout this user
+manual. To the right of the search text box are two arrows pointing upwards
+and downwards. Selecting these allow finding, respectively, the previous and
+the next occurence of the term being searched for.</p></div>
+<div class="imageblock" style="text-align:center;">
+<div class="content">
+<img src="images/usermanualfunctions.jpg" alt="User manual functions" />
+</div>
+</div>
+<div class="paragraph"><p><em>PREVIOUS/NEXT LINK</em>. One can move between links (underlined words allowing
+one to jump to specific sections in this user manual) by right-clicking on
+the text of the manual.  This brings up a context menu for jumping to
+previous links selected while reading the manual (see image above). For
+instance if a link in the manual has been selected, then the option to <em>Go
+Back</em> shows the text at the last link that was selected (similar to the
+Previous Page button in a browser). Conversely the <em>Go Forward</em> option
+enables jumping to the text perused before selecting the <em>Go Back</em>
+option. The <em>Reload</em> option causes the complete user manual to be reloaded
+into the user manual window.</p></div>
+</div>
+</div>
+<div class="sect1">
+<h2 id="S_UserSurvey">2. Le sondage utilisateur</h2>
+<div class="sectionbody">
+<div class="paragraph"><p>Dans le but de développer <em>Subsurface</em> d&#8217;une manière qui serve ses
+utilisateurs de la meilleur manière qu&#8217;il soit, il est important d&#8217;avoir des
 informations sur les utilisateurs. À l&#8217;ouverture de <em>Subsurface</em> après avoir
 utilisé le logiciel pendant une semaine environ, une fenêtre de sondage
 apparait. Cela est complètement optionnel et l&#8217;utilisateur contrôle quelles
@@ -1090,17 +1090,17 @@ box on the lefthand side of the dialogue (see image above). If this is not
 achieved, select the <em>Clear</em> button and then scan again for Bluetooth
 devices using the <em>Scan</em> button. After performing these actions <em>Subsurface</em>
 should see the dive computer.  The label of the discovered dive computer
-contains the name of the device, its address and its pairing status. If the
-device is not paired and has a red background colour, a context menu can be
-opened by selecting the item with a right-click.  Select the the <em>Pair</em>
-option and wait for the task to complete. If this dive computer is being
-paired to Subsurface for the first time, it is possible that Subsurface will
-request a Pass Code or PIN number. The most commonly-used Pass Code is 0000,
-and this works for the Shearwater Petrel. If necessary, consult the user
-manual of the dive computer being used.</p></div>
-<div class="sidebarblock">
-<div class="content">
-<div class="admonitionblock">
+contains the name of the device, its address and its pairing status. If the
+device is not paired and has a red background colour, a context menu can be
+opened by selecting the item with a right-click.  Select the the <em>Pair</em>
+option and wait for the task to complete. If this dive computer is being
+paired to Subsurface for the first time, it is possible that Subsurface will
+request a Pass Code or PIN number. The most commonly-used Pass Code is 0000,
+and this works for the Shearwater Petrel. If necessary, consult the user
+manual of the dive computer being used.</p></div>
+<div class="sidebarblock">
+<div class="content">
+<div class="admonitionblock">
 <table><tr>
 <td class="icon">
 <img src="images/icons/important.png" alt="Important" />
@@ -1135,37 +1135,37 @@ downloaded dives are shown on the righthand side of the download dialogue.</p></
 <div class="imageblock" style="text-align:center;">
 <div class="content">
 <img src="images/DC_import_Bluetooth_Windows.png" alt="FIGURE: Download Bluetooth on Windows" />
-</div>
-</div>
-<div class="paragraph"><p>On <em>Windows</em> platforms the <em>Local Bluetooth device details section</em> on the
-right is not displayed as is the case on the Linux/Mac implementations.  To
-successfully initiate a scan (by pressing the <em>Scan</em> button)  check that the
-Bluetooth device on the <em>Subsurface</em> computer is turned on by selecting the
-dive computer from the list of available Bluetooth devices (see image
-above). If the dive computer is accessed by Subsurface for the first time,
-it is possible that Subsurface will request a Pass Code/PIN number. Supply
-the Pass Code recommended in the user manual of the dive computer.  A Pass
-Code of 0000 is often appropriate.</p></div>
-<div class="paragraph"><p>The pairing step is checked and done automatically during the download
-process. If the devices have never been paired the system will ask for your
-permissions and put a message on the right side of the screen: <em>Add a
+</div>
+</div>
+<div class="paragraph"><p>On <em>Windows</em> platforms the <em>Local Bluetooth device details section</em> on the
+right is not displayed as is the case on the Linux/Mac implementations.  To
+successfully initiate a scan (by pressing the <em>Scan</em> button)  check that the
+Bluetooth device on the <em>Subsurface</em> computer is turned on by selecting the
+dive computer from the list of available Bluetooth devices (see image
+above). If the dive computer is accessed by Subsurface for the first time,
+it is possible that Subsurface will request a Pass Code/PIN number. Supply
+the Pass Code recommended in the user manual of the dive computer.  A Pass
+Code of 0000 is often appropriate.</p></div>
+<div class="paragraph"><p>The pairing step is checked and done automatically during the download
+process. If the devices have never been paired the system will ask for your
+permissions and put a message on the right side of the screen: <em>Add a
 device, Tap to set up your DC device</em>. Always allow this pairing. After a
 discovered item is selected, select the <em>Save</em> button.  Finally select the
 <em>Download</em> button on the <em>Download</em> dialogue and wait for the process to
 complete.</p></div>
 <div class="admonitionblock">
 <table><tr>
-<td class="icon">
-<img src="images/icons/important.png" alt="Important" />
-</td>
-<td class="content">Currently <em>Subsurface</em> works only with local Bluetooth adapters which use
-Microsoft Bluetooth Stack. If the local device uses <em>Widcomm</em>, <em>Stonestreet
-One Bluetopia Bluetooth</em> or <em>BlueSoleil</em> drivers it will definitely not
-work. However, Bluetooth hardware/dongles from these manufacturers
-(e.g. iSonic) that support the Microsoft Bluetooth Stack do work.</td>
-</tr></table>
-</div>
-<div class="paragraph"><p>A log messageOn the bottom left of the <em>Remote Bluetooth device selection</em>
+<td class="icon">
+<img src="images/icons/important.png" alt="Important" />
+</td>
+<td class="content">Currently <em>Subsurface</em> works only with local Bluetooth adapters which use
+Microsoft Bluetooth Stack. If the local device uses <em>Widcomm</em>, <em>Stonestreet
+One Bluetopia Bluetooth</em> or <em>BlueSoleil</em> drivers it will definitely not
+work. However, Bluetooth hardware/dongles from these manufacturers
+(e.g. iSonic) that support the Microsoft Bluetooth Stack do work.</td>
+</tr></table>
+</div>
+<div class="paragraph"><p>A log messageOn the bottom left of the <em>Remote Bluetooth device selection</em>
 shows details about the current status of the Bluetooth agent. To select
 another dive computer for download using the "Remote Bluetooth selection
 dialogue" press the three-dots button from the <em>"Choose Bluetooth download
@@ -2898,13 +2898,13 @@ oxygen toxicity units (OTU) incurred.</p></div>
 <td class="icon">
 <img src="images/icons/info.jpg" alt="Note" />
 </td>
-<td class="content">Gas consumption and SAC calculations: <em>Subsurface</em> calculates SAC and Gas
-consumption taking in account gas incompressibility, particularly at tank
-pressures above 200 bar, making them more accurate.  Users should refer to
-<a href="#SAC_CALCULATION">Appendix F</a> for more information.</td>
-</tr></table>
-</div>
-</div>
+<td class="content">Gas consumption and SAC calculations: <em>Subsurface</em> calculates SAC and Gas
+consumption taking in account gas incompressibility, particularly at tank
+pressures above 200 bar, making them more accurate.  Users should refer to
+<a href="#SAC_CALCULATION">Appendix F</a> for more information.</td>
+</tr></table>
+</div>
+</div>
 <div class="sect2">
 <h3 id="S_ExtraDataTab">6.2. The <strong>Extra Data</strong> tab (usually for individual dives)</h3>
 <div class="paragraph"><p>When using a dive computer, it often reports several data items that cannot
@@ -3299,24 +3299,24 @@ increased risk of exposure to the dangers associated with oxygen toxicity.</td>
 </div>
 <div class="admonitionblock">
 <table><tr>
-<td class="icon">
-<img src="images/icons/NDL.jpg" alt="Note" />
-</td>
-<td class="content">Clicking this button causes the Information Box to display either 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. TTS is calculated assuming an ascent surface air
-consumption (SAC) for the gas currently used. Even if the profile contains
-several gas switches, TTS at a specific moment during the dive is calculated
-using the current gas.  For TTS longer than 2 hours, it is not accurately
-calculated and Subsurface only indicates <em>TTS &gt; 2h</em>.</td>
-</tr></table>
-</div>
-<div class="admonitionblock">
+<td class="icon">
+<img src="images/icons/NDL.jpg" alt="Note" />
+</td>
+<td class="content">Clicking this button causes the Information Box to display either 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. TTS is calculated assuming an ascent surface air
+consumption (SAC) for the gas currently used. Even if the profile contains
+several gas switches, TTS at a specific moment during the dive is calculated
+using the current gas.  For TTS longer than 2 hours, it is not accurately
+calculated and Subsurface only indicates <em>TTS &gt; 2h</em>.</td>
+</tr></table>
+</div>
+<div class="admonitionblock">
 <table><tr>
 <td class="icon">
 <img src="images/icons/SAC.jpg" alt="Note" />
@@ -3704,15 +3704,15 @@ l&#8217;image <strong>B</strong> ci dessous est présenté, avec un bouton <em>D
 Facebook</em> pour fermer la connexion <em>Facebook</em>.</p></div>
 <div class="imageblock" style="text-align:center;">
 <div class="content">
-<img src="images/facebook1_f20.jpg" alt="Figure: Facebook login" />
-</div>
-</div>
-<div class="paragraph"><p>From the <em>Subsurface</em> window it is easy to determine whether <em>Subsurface</em>
-has a valid connection to <em>Facebook</em> From the <strong>Main Menu</strong>, select <em>Share on
-&#8594; Facebook</em> (image <strong>A</strong>, below). Normally, the <em>Facebook</em> option is greyed
-out. But if there is a connection to <em>Facebook</em>, this option is active
-(i.e. in black colour and can be selected).</p></div>
-<div class="paragraph"><p>Une fois qu&#8217;une connexion à <em>Facebook</em> est établie, transférer un profil de
+<img src="images/facebook1_f20.jpg" alt="Figure: Facebook login" />
+</div>
+</div>
+<div class="paragraph"><p>From the <em>Subsurface</em> window it is easy to determine whether <em>Subsurface</em>
+has a valid connection to <em>Facebook</em> From the <strong>Main Menu</strong>, select <em>Share on
+&#8594; Facebook</em> (image <strong>A</strong>, below). Normally, the <em>Facebook</em> option is greyed
+out. But if there is a connection to <em>Facebook</em>, this option is active
+(i.e. in black colour and can be selected).</p></div>
+<div class="paragraph"><p>Une fois qu&#8217;une connexion à <em>Facebook</em> est établie, transférer un profil de
 plongée vers <em>Facebook</em> est facile. Assurez-vous que la plongée à transférer
 est affichée dans le panneau <strong>Profil de plongée</strong> de <em>Subsurface</em>. Si, à
 partir du <strong>menu principal</strong>, vous sélectionnez <em>Partager sur &#8594; Facebook</em>,
@@ -4257,13 +4257,13 @@ changes to the preferences are not saved.</p></div>
 </p>
 </li>
 <li>
-<p>
-<strong>Dives</strong>: For the <em>Default Dive File</em> one needs to specify the directory and
-     file name of one&#8217;s
-     electronic dive log book. This is a file with filename extension of either <em>.xml</em> or <em>.ssrf</em>. When
-     launched, <em>Subsurface</em> will automatically load the specified dive log book. There are three options:
-</p>
-<div class="ulist"><ul>
+<p>
+<strong>Dives</strong>: For the <em>Default Dive File</em> one needs to specify the directory and
+     file name of one&#8217;s
+     electronic dive log book. This is a file with filename extension of either <em>.xml</em> or <em>.ssrf</em>. When
+     launched, <em>Subsurface</em> will automatically load the specified dive log book. There are three options:
+</p>
+<div class="ulist"><ul>
 <li>
 <p>
 <em>No default file</em>: When checked, <em>Subsurface</em> does not automatically load a dive log at startup.
@@ -4670,20 +4670,20 @@ In the top left-hand area of the planning screen, ensure that the constant
 </p>
 </li>
 <li>
-<p>
-In the table labelled <em>Available Gases</em>, add the information of the
-  cylinders to be used as well as the gas composition within that
-  cylinder. This is done in a similar way as for
-  <a href="#cylinder_definitions">providing cylinder data for dive logs</a>. Choose the
-  cylinder type by double clicking the cylinder type and using the dropdown
-  list, then specify the work pressure of this cylinder. By leaving the oxygen
-  concentration (O2%) filed empty, the cylinder is assumed to contain
-  air. Otherwise enter the oxygen and/or helium concentration in the boxes
-  provided in this dialogue. Add additional cylinders by using the "+" icon to
-  the top right-hand of the dialogue.
-</p>
-</li>
-<li>
+<p>
+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="#cylinder_definitions">providing cylinder data for dive logs</a>. Choose the
+  cylinder type by double clicking the cylinder type and using the dropdown
+  list, then specify the work pressure of this cylinder. By leaving the oxygen
+  concentration (O2%) filed empty, the cylinder is assumed to contain
+  air. Otherwise enter the oxygen and/or helium concentration in the boxes
+  provided in this dialogue. Add additional cylinders by using the "+" icon to
+  the top right-hand of the dialogue.
+</p>
+</li>
+<li>
 <p>
 The profile of the planned dive can be created in two ways:
 </p>
@@ -4760,16 +4760,16 @@ The planner calculates whether the specified cylinder contains enough
 </p>
 </li>
 <li>
-<p>
-Define the amount of gas that the cylinder must have at the end of the
-  bottom section of the dive just before ascent. A value of 50 bar is often
-  used. The reason for this reserve gas is to provide for the possible need to
-  bring one&#8217;s buddy to the surface using gas sharing. How much gas is used in
-  sharing depends on the depth of the ascent. This can be a bit hard to
-  estimate, so most agencies assume a fixed amount of gas, or actually of
-  pressure e.g. 40 or 50 bar or 25% or 33% (rule of thirds). But <em>Subsurface</em>
-  can do better because it knows about the ascent and that is why we add the
-  amount of gas during the ascent (i.e. the "deco gas“).  Subsurface still
+<p>
+Define the amount of gas that the cylinder must have at the end of the
+  bottom section of the dive just before ascent. A value of 50 bar is often
+  used. The reason for this reserve gas is to provide for the possible need to
+  bring one&#8217;s buddy to the surface using gas sharing. How much gas is used in
+  sharing depends on the depth of the ascent. This can be a bit hard to
+  estimate, so most agencies assume a fixed amount of gas, or actually of
+  pressure e.g. 40 or 50 bar or 25% or 33% (rule of thirds). But <em>Subsurface</em>
+  can do better because it knows about the ascent and that is why we add the
+  amount of gas during the ascent (i.e. the "deco gas“).  Subsurface still
   uses a fixed pressure „reserve“ but that is supposed to be for the
   additional gas used around the realisation that there is a problem and one&#8217;s
   pulse rate goes up when one starts to buddy breathe. This reserve amount is
@@ -5472,27 +5472,27 @@ vous devriez pouvoir importer vos plongées.</p></div>
 <div class="admonitionblock">
 <table><tr>
 <td class="icon">
-<img src="images/icons/bluetooth.jpg" alt="Note" />
-</td>
-<td class="content">For dive computers communicating through Bluetooth like the Heinrichs
-Weikamp Frog or the Shearwater Predator, Petrel and Nerd there is a
-different procedure to get the devices name to communicate with
-<em>Subsurface</em>. Follow these steps:</td>
-</tr></table>
-</div>
-<div class="ulist"><ul>
+<img src="images/icons/bluetooth.jpg" alt="Note" />
+</td>
+<td class="content">For dive computers communicating through Bluetooth like the Heinrichs
+Weikamp Frog or the Shearwater Predator, Petrel and Nerd there is a
+different procedure to get the devices name to communicate with
+<em>Subsurface</em>. Follow these steps:</td>
+</tr></table>
+</div>
+<div class="ulist"><ul>
 <li>
 <p>
 <strong>For the dive computer, after enabling Bluetooth, ensure it is in Upload mode.</strong>
 </p>
-</li>
-</ul></div>
-<div class="paragraph"><p>For Bluetooth pairing of the dive computer, refer to the manufacturer&#8217;s user
-guide. When using a Shearwater Predator/Petrel/Nerd, select <em>Dive Log &#8594;
-Upload Log</em> and wait for the <em>Wait PC</em> message.</p></div>
-<div class="ulist"><ul>
-<li>
-<p>
+</li>
+</ul></div>
+<div class="paragraph"><p>For Bluetooth pairing of the dive computer, refer to the manufacturer&#8217;s user
+guide. When using a Shearwater Predator/Petrel/Nerd, select <em>Dive Log &#8594;
+Upload Log</em> and wait for the <em>Wait PC</em> message.</p></div>
+<div class="ulist"><ul>
+<li>
+<p>
 <strong>Pair the <em>Subsurface</em> computer with the dive computer.</strong>
 </p>
 </li>
@@ -5548,18 +5548,18 @@ Establish an RFCOMM connection
 <li>
 <p>
 Download the dives with Subsurface
-</p>
-</li>
-</ul></div>
-<div class="paragraph"><p>Ensure the dive computer is in upload mode. On the <em>Shearwater Petrel</em>,
-<em>Petrel 2</em> and <em>Nerd</em> cycle through the menu, select <em>Dive Log</em>, then
-<em>Upload Log</em>.  The display will read <em>Initializing</em>, then <em>Wait PC 3:00</em> and
-will countdown.  Once the connection is established, the display reads <em>Wait
-CMD &#8230;</em> and the countdown continues. When downloading the dive from
-Subsurface, the display reads <em>Sending</em> then <em>Sent Dive</em>.</p></div>
-<div class="paragraph"><p>To establish the connection, establish root access through <code>sudo</code> or <code>su</code>.
-The correct permission is required to download the dives in the computer. On
-most Linux systems this means becoming a member of the dialout group (This
+</p>
+</li>
+</ul></div>
+<div class="paragraph"><p>Ensure the dive computer is in upload mode. On the <em>Shearwater Petrel</em>,
+<em>Petrel 2</em> and <em>Nerd</em> cycle through the menu, select <em>Dive Log</em>, then
+<em>Upload Log</em>.  The display will read <em>Initializing</em>, then <em>Wait PC 3:00</em> and
+will countdown.  Once the connection is established, the display reads <em>Wait
+CMD &#8230;</em> and the countdown continues. When downloading the dive from
+Subsurface, the display reads <em>Sending</em> then <em>Sent Dive</em>.</p></div>
+<div class="paragraph"><p>To establish the connection, establish root access through <code>sudo</code> or <code>su</code>.
+The correct permission is required to download the dives in the computer. On
+most Linux systems this means becoming a member of the dialout group (This
 is identical as for many dive computers using a Linux USB port, described in
 the previous section). On the command terminal, enter:</p></div>
 <div class="paragraph"><p><code>sudo usermod -a -G dialout username</code></p></div>
@@ -5674,23 +5674,23 @@ Scanning ...
 </ul></div>
 <div class="paragraph"><p>If one omits it, channel 1 is assumed.  Based on a limited number of user
 reports, the appropriate channel for the dive computer is probably:</p></div>
-<div class="ulist"><ul>
-<li>
-<p>
-<em>Shearwater Petrel 1</em>: channel 1
-</p>
-</li>
-<li>
-<p>
-<em>Shearwater Petrel 2</em>: channel 5
-</p>
-</li>
-<li>
-<p>
-<em>Shearwater Nerd</em>: channel 5
-</p>
-</li>
-<li>
+<div class="ulist"><ul>
+<li>
+<p>
+<em>Shearwater Petrel 1</em>: channel 1
+</p>
+</li>
+<li>
+<p>
+<em>Shearwater Petrel 2</em>: channel 5
+</p>
+</li>
+<li>
+<p>
+<em>Shearwater Nerd</em>: channel 5
+</p>
+</li>
+<li>
 <p>
 <em>Heinrichs-Weikamp OSTC Sport</em>: channel 1
 </p>
@@ -5851,13 +5851,13 @@ in the <em>Graph Settings</em> in <em>Subsurface</em> to generate a deco overlay
 by <em>Subsurface</em> will most likely differ from the one displayed on the xDEEP
 BLACK.</td>
 </tr></table>
-</div>
-</div>
-<div class="sect2">
-<h3 id="_importing_from_shearwater_predator_petrel_nerd_using_bluetooth">16.5. Importing from Shearwater Predator/Petrel/Nerd using Bluetooth</h3>
-<div class="admonitionblock">
-<table><tr>
-<td class="icon">
+</div>
+</div>
+<div class="sect2">
+<h3 id="_importing_from_shearwater_predator_petrel_nerd_using_bluetooth">16.5. Importing from Shearwater Predator/Petrel/Nerd using Bluetooth</h3>
+<div class="admonitionblock">
+<table><tr>
+<td class="icon">
 <img src="images/icons/predator.jpg" alt="Note" />
 </td>
 <td class="content">Specific instructions for downloading dives using Bluetooth are given in the
@@ -6878,11 +6878,11 @@ salvaged after being over written by new dives.</p></div>
 </div>
 </div>
 </div>
-<div id="footnotes"><hr /></div>
-<div id="footer">
-<div id="footer-text">
-Last updated 2015-10-29 10:42:47 CET
-</div>
-</div>
-</body>
+<div id="footnotes"><hr /></div>
+<div id="footer">
+<div id="footer-text">
+Last updated 2015-12-15 13:35:30 PST
+</div>
+</div>
+</body>
 </html>
diff --git a/Documentation/user-manual_ru.html.git b/Documentation/user-manual_ru.html.git
index 6a567d8b4..1cda8a63d 100644
--- a/Documentation/user-manual_ru.html.git
+++ b/Documentation/user-manual_ru.html.git
@@ -202,6 +202,40 @@ ol.upperroman               { list-style-type: upper-roman; }
 .hdlist td                  { vertical-align: top; }
 
 
+@media screen {
+  body {
+    max-width: 50em; /* approximately 80 characters wide */
+    margin-left: 16em;
+  }
+
+  #toc {
+    position: fixed;
+    top: 0;
+    left: 0;
+    bottom: 0;
+    width: 13em;
+    padding: 0.5em;
+    padding-bottom: 1.5em;
+    margin: 0;
+    overflow: auto;
+    border-right: 3px solid #f8f8f8;
+    background-color: white;
+  }
+
+  #toc .toclevel1 {
+    margin-top: 0.5em;
+  }
+
+  #toc .toclevel2 {
+    margin-top: 0.25em;
+    display: list-item;
+    color: #aaaaaa;
+  }
+
+  #toctitle {
+    margin-top: 0.5em;
+  }
+}
 </style>
 <script type="text/javascript">
 /*<![CDATA[*/
@@ -476,16 +510,39 @@ libdivecomputer.</p></div>
   <noscript><p><b>JavaScript must be enabled in your browser to display the table of contents.</b></p></noscript>
 </div>
 <div class="sect1">
-<h2 id="S_UserSurvey">1. Работа с этим руководством</h2>
+<h2 id="_работа_с_этим_руководством">1. Работа с этим руководством</h2>
 <div class="sectionbody">
 <div class="paragraph"><p>Если руководство открыто из <em>Subsurface</em>, то вы не увидите никаких элементов
-управления. Однако важная функция <em>поиска</em> доступна по нажатию комбинации клавиш
-control-F или command-F. Используйте текстовое поле в нижней части экрана для поиска
-нужной информации в руководстве.</p></div>
+управления. Однако вам доступны две удобных функции:</p></div>
+<div class="ulist"><ul>
+<li>
+<p>
+<em>ПОИСК</em> активируется нажатием комбинации клавиш control-F или command-F.
+  Используйте текстовое поле в нижней части экрана для поиска нужной информации
+  в руководстве.  Справа от поля поиска кнопки с изображением стрелок вверх и
+  вниз позволяют перемещаться по результатам поиска.
+</p>
+</li>
+</ul></div>
+<div class="imageblock" style="text-align:center;">
+<div class="content">
+<img src="images/usermanualfunctions.jpg" alt="Руководство пользователя" />
+</div>
+</div>
+<div class="ulist"><ul>
+<li>
+<p>
+<em>ИСТОРИЯ ПЕРЕХОДОВ</em>. Как и в случае работы с веб-браузером, вы можете
+  переходить по ссылкам в руководстве. Контекстное меню (его вы можете вызвать
+  правым щелчком мыши) позволяет вам перемещаться по истории переходов вперед и
+  назад.
+</p>
+</li>
+</ul></div>
 </div>
 </div>
 <div class="sect1">
-<h2 id="_опрос_пользователей">2. Опрос пользователей</h2>
+<h2 id="S_UserSurvey">2. Опрос пользователей</h2>
 <div class="sectionbody">
 <div class="paragraph"><p>Для того, чтобы <em>Subsurface</em> удовлетворял всем потребностям наших пользователей,
 нам важно знать о вас. После нескольких дней использования <em>Subsurface</em> предложит
@@ -981,7 +1038,10 @@ Bluetooth-устройство. Убедитесь, что на компьюте
 показывается их название, адрес и статус сопряжения. Если устройство не
 сопряжено и подсвечено красным цветом, щелкните на нем правой кнопкой мыши и из
 контекстного меню выберите пункт <em>Сопряжение</em>. Дождитесь окончания этого
-действия.</p></div>
+действия. Если сопряжение с этим устройством производится впервые, <em>Subsurface</em>
+может запросить пароль или PIN-код. Наиболее часто используется код 0000 (например,
+это работает с Shearwater Petrel). При необходимости обратитесь к руководству
+пользователя вашего дайв-компьютера.</p></div>
 <div class="sidebarblock">
 <div class="content">
 <div class="admonitionblock">
@@ -1021,9 +1081,13 @@ Bluetooth-устройства будет закрыто. Теперь в окн
 <img src="images/DC_import_Bluetooth_Windows.png" alt="Рисунок: Сопряжение устройств Bluetooth в Windows" />
 </div>
 </div>
-<div class="paragraph"><p>На платформе <em>Windows</em> детали локального Bluetooth-адаптера не отображаются.
+<div class="paragraph"><p>На платформе <em>Windows</em> детали локального Bluetooth-адаптера не отображаются как в
+случае Mac и Linux.
 Для успешного обнаружения дайв-компьютера убедитесь, что на вашем компьютере
-включен Bluetooth. Используйте кнопку <em>Сканировать</em> для обнаружения устройств.</p></div>
+включен Bluetooth. Используйте кнопку <em>Сканировать</em> для обнаружения устройств.
+Если сопряжение устройства производится впервые, вам возможно придется указать
+PIN-код. Обычно это 0000; при необходимости обратитесь к руководству пользователя
+вашего дайв-компьютера.</p></div>
 <div class="paragraph"><p>Сопряжение устройств происходит автоматически при загрузке погружений. Если до
 этого устройства никогда не были сопряжены, операционная система запросит
 подтверждение и выведет уведомление в правой части экрана: <em>Добавление устройства,
@@ -1035,9 +1099,10 @@ Bluetooth-устройства будет закрыто. Теперь в окн
 <td class="icon">
 <img src="images/icons/important.png" alt="Важно" />
 </td>
-<td class="content">Учтите, что в настоящий момент <em>Subsurface</em> работает только с локальными Bluetooth-адаптерами,
-использующими стэк Microsoft Bluetooth. Прочие, использующие драйверы <em>Widcomm</em>,
-<em>Stonestreet One Bluetopia Bluetooth</em> или <em>BlueSolei</em>, заведомо работать не будут.</td>
+<td class="content">Учтите, что в настоящий момент <em>Subsurface</em> работает только с локальными Bluetooth-адаптерами
+и Bluetooth-брелками, использующими стэк Microsoft Bluetooth (например, iSonic).
+Прочие, использующие драйверы <em>Widcomm</em>, <em>Stonestreet One Bluetopia Bluetooth</em> или
+<em>BlueSolei</em>, заведомо работать не будут.</td>
 </tr></table>
 </div>
 <div class="paragraph"><p>Информационное сообщение в левой нижней части окна выбора Bluetooth-устройства
@@ -2917,7 +2982,9 @@ CCR-погружений в дополнение к тем, что были им
 возникновения декомпрессионных обязательств (т.е. пока не появится потолок).
 Как только NDL превышен и появляются декомпрессионные обязательства, TTS
 указывает время до всплытия на поверхность, включая время всплытия и
-декомпрессии.</td>
+декомпрессии. TTS рассчитывается исходя и расхода (SAC) текущего газа, даже
+если на профиле указаны переходы на другие смеси.Значения TTS, превышающие 2
+часа, не могут быть точно рассчитаны и <em>Subsurface</em> отображает <em>TTS &gt; 2ч</em>.</td>
 </tr></table>
 </div>
 <div class="admonitionblock">
@@ -3472,7 +3539,7 @@ HTML (см. рисунок <strong>В</strong> выше). Вы можете вы
 </ul></div>
 </div>
 <div class="sect2">
-<h3 id="_доступ_из_веб_браузера_к_облачному_хранилищу_em_subsurface_em">9.3. Доступ из веб-браузера к облачному хранилищу <em>Subsurface</em></h3>
+<h3 id="S_Cloud_storage">9.3. Доступ из веб-браузера к облачному хранилищу <em>Subsurface</em></h3>
 <div class="paragraph"><p>Одним из преимуществ облачного хранилища является то, что вы можете получить доступ к данным
 вашего журнала погружений, используя обычный веб-браузер. Откройте ссылку
 <a href="https://cloud.subsurface-divelog.org"><em>https://cloud.subsurface-divelog.org</em></a>, введите свой
@@ -3804,7 +3871,7 @@ D3, Vyper, Vytec, Cobra, Gekko И Zoop). Множество параметров
 <img src="images/Pref3_f20.jpg" alt="Рисунок: настройки профиля" />
 </div>
 </div>
-<div class="paragraph"><p>В этой панели доступно две группы настроек:</p></div>
+<div class="paragraph" id="S_GradientFactors"><p>В этой панели доступно две группы настроек:</p></div>
 <div class="ulist"><ul>
 <li>
 <p>
@@ -4468,7 +4535,7 @@ SAC отдельно для донной фазы (<em>SAC на дне</em>) и
 <li>
 <p>
 <em>Открыть облачное хранилище</em> - Загружает ранее сохраненный журнал из
-   <a href="#S_Cloud_access"><em>облачного хранилища</em></a>.
+   <a href="#S_Cloud_storage"><em>облачного хранилища</em></a>.
 </p>
 </li>
 <li>
@@ -4478,7 +4545,7 @@ SAC отдельно для донной фазы (<em>SAC на дне</em>) и
 </li>
 <li>
 <p>
-<em>Сохранить в облаке</em> - Сохраняет журнал в <a href="#S_Cloud_access"><em>облачном хранилище</em></a>.
+<em>Сохранить в облаке</em> - Сохраняет журнал в <a href="#S_Cloud_storage"><em>облачном хранилище</em></a>.
 </p>
 </li>
 <li>
@@ -4844,7 +4911,7 @@ USB-порту, у вас должно получиться импортиров
 <img src="images/icons/bluetooth.jpg" alt="Замечание" />
 </td>
 <td class="content">Для дайв-компьютеров с Bluetooth-интерфейсом (например, Heinrichs Weikamp Frog
-или Shearwater Predator и Petrel), процедура получения имени устройства
+или Shearwater Predator, Petrel или Nerd), процедура получения имени устройства
 отличается от той, что описана выше:</td>
 </tr></table>
 </div>
@@ -4856,7 +4923,7 @@ USB-порту, у вас должно получиться импортиров
 </li>
 </ul></div>
 <div class="paragraph"><p>По вопросам сопряжения дайв-компьютера обратитесь к документации
-производителя. В случае Shearwater Predator/Petrel выберите <em>Dive Log &#8594;
+производителя. В случае Shearwater Predator/Petrel/Nerd выберите <em>Dive Log &#8594;
 Upload Log</em> и ожидайте сообщения <em>Wait PC</em>.</p></div>
 <div class="ulist"><ul>
 <li>
@@ -4914,7 +4981,7 @@ Bluetooth&#8230;</em>. Дайв-компьютер должен появитьс
 </p>
 </li>
 </ul></div>
-<div class="paragraph"><p>Убедитесь, что дайв-компьютер в режиме выгрузки. На <em>Shearwater Petrel</em> и <em>Petrel 2</em> выберите
+<div class="paragraph"><p>Убедитесь, что дайв-компьютер в режиме выгрузки. На <em>Shearwater Petrel</em>, <em>Petrel 2</em> и <em>Nerd</em> выберите
 в меню <em>Dive Log</em>, затем <em>Upload Log</em>. На дисплее высветится <em>Initializing</em>, <em>Wait PC 3:00</em> и
 начнется обратный отсчет. После установки соединения на дисплее высветится <em>Wait CMD &#8230;</em> и
 отсчет продолжится. Во время загрузки погружений на дисплее отображается надпись <em>Sending</em>, а
@@ -5032,12 +5099,17 @@ Scanning ...
 <div class="ulist"><ul>
 <li>
 <p>
+<em>Shearwater Petrel 1</em>: канал 1
+</p>
+</li>
+<li>
+<p>
 <em>Shearwater Petrel 2</em>: канал 5
 </p>
 </li>
 <li>
 <p>
-<em>Shearwater Petrel 1</em>: канал 1
+<em>Shearwater Nerd</em>: канал 5
 </p>
 </li>
 <li>
@@ -5190,7 +5262,7 @@ UDDF-файл для каждого погружения. Выделите вс
 </div>
 </div>
 <div class="sect2">
-<h3 id="_импорт_погружений_из_shearwater_predator_используя_bluetooth">16.5. Импорт погружений из Shearwater Predator используя Bluetooth</h3>
+<h3 id="_импорт_погружений_из_shearwater_predator_petrel_nerd_используя_bluetooth">16.5. Импорт погружений из Shearwater Predator/Petrel/Nerd используя Bluetooth</h3>
 <div class="admonitionblock">
 <table><tr>
 <td class="icon">
@@ -6113,7 +6185,7 @@ SAC не совпадают со значением в <em>Subsurface</em>. Во
 <div id="footnotes"><hr /></div>
 <div id="footer">
 <div id="footer-text">
-Последнее обновление 2015-10-14 05:50:44 PDT
+Последнее обновление 2015-12-15 13:35:30 PST
 </div>
 </div>
 </body>