Documentation: add mobile user manual to POT/PO management and update french translation of user-manual and mobile-manual

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

1 files changed, 1460 insertions, 1560 deletions

diff --git a/Documentation/user-manual_fr.txt b/Documentation/user-manual_fr.txt
index 9a42072ff..12c886571 100644
--- a/Documentation/user-manual_fr.txt
+++ b/Documentation/user-manual_fr.txt
@@ -27,29 +27,27 @@ rapport à d'autres solutions logicielles similaires :
    ou de loisir ? Utilisez-vous un enregistreur de profondeur et de durée
    Reefnet Sensus avec un ordinateur de plongée ? _Subsurface_ offre une
    interface standard pour télécharger les enregistrements des plongées à
-   partir de tous ces équipements de plongée et pour enregistrer et analyser
+   partir de tous ces équipements de plongée, en enregistrant et en analysant
    ces enregistrements dans un système unique.
  - Utilisez-vous plus d'un système d'exploitation ? _Subsurface_ est
    intégralement compatible avec Mac, Linux et Windows, ce qui vous permet
    d'accéder à vos enregistrements de plongées sur chaque système
    d'exploitation en utilisant une application unique.
- - Utilisez-vous Linux ou Mac et votre ordinateur de plongée n'a que des
+ - Utilisez-vous Linux ou Mac mais votre ordinateur de plongée n'a que des
    logiciels pour Windows pour télécharger les informations de plongées (par
    exemple Mares) ? _Subsurface_ fournit un moyen de télécharger et d'analyser
    vos enregistrements de plongées sur d'autres systèmes d'exploitation.
  - Avez-vous besoin d'un planificateur de plongée graphique intuitif qui
    intègre et prend en compte les plongées qui ont déjà été enregistrées ?
- - Avez-vous besoin d'un moyen d'enregistrer ou de sauvegarder votre carnet de
-   plongée sur Internet, Vous permettant de visualiser votre carnet depuis
-   n'importe où, en utilisant un navigateur Internet ?
-
-_Subsurface_ est disponible pour Windows (Win XP ou plus récent), les Macs
-basés sur processeurs Intel (OS/X) et de nombreuses distributions
-Linux. _Subsurface_ peut être compilé pour bien plus de plateformes
-matérielles et d'environnements logiciels où Qt et libdivecomputer sont
-disponibles.
-
-Le but de ce document est l'utilisation du programme Subsurface. Pour
+Avez-vous besoin d'un moyen d'nregistrer et de sauvegarder vos plongées sur
+Internet, vous permettant de les voir depuis n'importe où en utilisant un
+navigateur Internet ? _Subsurface_ est disponible pour Windows (Win XP ou
+plus récent), les Macs basés sur processeurs Intel (OS/X) et de nombreuses
+distributions Linux. _Subsurface_ peut être compilé pour bien plus de
+plateformes matérielles et d'environnements logiciels où Qt et
+libdivecomputer sont disponibles.
+
+Ce manuel explique comment utiliser le programme _Subsurface_. Pour
 installer le logiciel, consultez la page _Téléchargement_ sur le
 http://subsurface-divelog.org/[site web de _Subsurface_]. En cas de
 problème, vous pouvez envoyer un e-mail sur
@@ -73,44 +71,35 @@ provided:
 
 The _SEARCH_ 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 "_weights_" 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.
-
+image below).  For instance, typing the word "_weights_" 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.
 image::images/usermanualfunctions.jpg["User manual functions", align="center"]
 
 
-_PREVIOUS/NEXT LINK_. 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 _Go
-Back_ shows the text at the last link that was selected (similar to the
-Previous Page button in a browser). Conversely the _Go Forward_ option
-enables jumping to the text perused before selecting the _Go Back_
-option. The _Reload_ option causes the complete user manual to be reloaded
-into the user manual window.
-
+_PREVIOUS/NEXT LINK_. 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
+_Go Back_ shows the text at the last link selected (similar to the Previous
+Page button in a browser). Conversely the _Go Forward_ option jumps to the
+text seen before selecting the _Go Back_ option. The _Reload_ option reloads
+the complete user manual into the window.
 [[S_UserSurvey]]
 Le sondage utilisateur
 ----------------------
-Dans le but de développer _Subsurface_ d'une manière qui serve ses
-utilisateurs de la meilleur manière qu'il soit, il est important d'avoir des
-informations sur les utilisateurs. À l'ouverture de _Subsurface_ après avoir
-utilisé le logiciel pendant une semaine environ, une fenêtre de sondage
-apparait. Cela est complètement optionnel et l'utilisateur contrôle quelles
-informations sont envoyées ou non à l'équipe de développement de
-_Subsurface_. Toutes les données que l'utilisateur choisit d'envoyer sont
-extrêmement utiles et ne seront utilisées que pour les futures
-développements et modifications du logiciel pour coller au mieux aux besoins
-des utilisateurs de _Subsurface_. Si vous complétez le sondage ou cliquez
-sur l'option pour ne plus être sondé, cela devrait être la dernière
-communication de ce type que vous recevrez. Cependant, si vos habitudes de
-plongées ou d'utilisation de Subsurface changent, vous pouvez envoyer un
-nouveau sondage en démarrant _Subsurface_ avec l'option  _--survey_ sur la
-ligne de commande.
+In order to develop _Subsurface_ to serve its users in the best possible
+way, it’s important to have user information. Upon launching _Subsurface_
+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 _Subsurface_ development 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 _Subsurface_ 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
+_Subsurface_ with the _--survey_ option on the command line.
 
 [[S_StartUsing]]
 Commencer à utiliser le programme
@@ -121,47 +110,40 @@ principal* (Fichier Importer Journal Vue Aide) en haut de la fenêtre (pour
 Windows et Linux) ou en haut de l'écran (pour Mac et Ubuntu Unity). Les
 quatre panneaux sont :
 
-La *liste des plongées* en bas à gauche, contenant une liste de toutes les
-plongées du journal (carnet) de plongées de l'utilisateur. Une plongée peut
-être sélectionnée et mise en surbrillance dans la liste en cliquant
-dessus. Dans la plupart des cas, les touches haut/bas peuvent être utilisée
-pour passer d'une plongée à l'autre. La *liste des plongées* est un outil
-important pour manipuler un journal (carnet) de plongée.
-
-La *carte de plongée* en bas à droite, affiche les sites de plongées de
-l'utilisateur, sur une carte mondiale et centrée sur le site de la dernière
-plongée sélectionnée dans la *liste des plongées*.
-
-Les *informations* en haut à gauche, fournissent des informations détaillées
-sur la plongée sélectionnée dans la *liste des plongées*, dont des
-statistiques pour la plongée sélectionnée ou pour toutes les plongées mises
-en surbrillance.
-
-Le *profil de plongée* en haut à droite, affiche un profil de plongée
-graphique de la plongée sélectionnée dans la *liste des plongées*.
-
-Les séparateurs entre ces panneaux peuvent être déplacés pour modifier la
-taille de chaque panneau. _Subsurface_ mémorise la position de ces
-séparateurs, pour qu'au prochain lancement _Subsurface_ utilise ces
-positions.
-
-Si une unique plongée est sélectionnée dans la *liste des plongées*,
-l'emplacement de la plongée, les informations détaillées et le profil de la
-_plongée sélectionnée_ sont affichées dans les panneaux respectifs. D'autre
-part, si plusieurs plongées sont sélectionnées, la dernière mise en
-surbrillance est la _plongée sélectionnée_, mais les données de _toutes les
-plongées mises en surbrillances_ sont affichées dans l'onglet *Stats* du
-panneau *informations* (profondeur maximale, minimale et moyenne, les
-durées, les températures de l'eau et le SAC (air consommé); temps total et
-nombre de plongées sélectionnées).
+The *Dive List* on the bottom left, showing all the dives in the user'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 between
+dives. The *Dive List* is an important tool for manipulating a dive log.
+
+The *Dive Map* on the bottom right, showing the user's dive sites on a world
+map and centered on the site of the last dive selected in the *Dive List*.
+
+The *Info* on the top left, giving more detailed information on the dive
+selected in the *Dive List*, including some statistics for the selected dive
+or for all highlighted dive(s).
+
+The *Dive Profile* on the top right, showing a graphical dive profile of the
+selected dive in the *Dive List*.
+
+The dividers between panels can be dragged to change the size of any of the
+panels. _Subsurface_ remembers the position of the dividers, so the next
+time _Subsurface_ starts it uses the positions of the dividers from the last
+time the program was used.
+
+If a single dive is selected in the *Dive List*, the dive location, detailed
+information and profile of the _selected dive_ are shown in the respective
+panels. If several dives are selected, the last highlighted dive is the
+_selected dive_, but summary data of all _highlighted dives_ is shown in the
+*Stats* tab of the *Info* panel (maximum, minimum and average depths,
+durations, water temperatures and SAC; total time and number of dives
+selected).
 
 [[S_ViewPanels]]
 
 image::images/main_window_f22.jpg["The Main Window", align="center"]
 
-L'utilisateur peut déterminer si lesquels des quatre panneaux sont affichés
-en sélectionnant l'option *Vue* dans le menu principal. Cette fonctionnalité
-permet plusieurs choix d'affichage :
+The user decides which of the four panels are displayed by selecting the
+*View* option on the main menu. This feature has several choices of display:
 
 *Tout* : affiche les quatre panneaux tels que sur la capture d'écran ci-dessus.
 
@@ -172,43 +154,37 @@ permet plusieurs choix d'affichage :
 *Info* : affiche uniquement les notes de plongées de la dernière plongée sélectionnée et les statistiques pour
 toutes les plongées mises en surbrillance.
 
-*Globe* : affiche uniquement la carte mondiale, centrée sur la dernière plongée sélectionnée.
+*Globe*: Show only the world map, centered on the last selected dive.
 
-Comme la plupart des autre fonctions qui peuvent être accédée via le menu
-principal, ces options peuvent être utilisées par des raccourcis
-clavier. Les raccourcis pour un système particulier sont affichés avec un
-souligné des les entrées de menu. À cause des différents systèmes
-d'exploitation et des divers langues, _Subsurface_ peut utiliser différentes
-touches de raccourcis et ne sont donc pas détaillées ici.
+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’s chosen language
+may cause _Subsurface_ to use different shortcut keys, they are not listed
+in this user manual.
 
-Lorsque le programme est lancé pour la première fois, il n'affiche aucune
-information. Ceci parce que le programme n'a aucune information de plongée
-disponible. Dans les sections suivantes, le procédure pour créer a nouveau
-carnet de plongée sera détaillée.
+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.
 
 [[S_NewLogbook]]
 Créer un nouveau carnet de plongée
 ----------------------------------
-Sélectionner _Fichier -> Nouveau carnet de plongée_ à partir du menu
-principal. Toutes les données de plongées sont effacées pour que de
-nouvelles puissent être ajoutées. S'il existe des données non encore
-enregistrées dans le carnet ouvert, l'utilisateur devra sélectionner s'il
-faut les enregistrer ou non avant de créer le nouveau carnet.
+Select _File -> New Logbook_ from the main menu. All existing dive data are
+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.
 
 [[S_GetInformation]]
 == Enregistrement des informations de plongée dans le carnet
-
-Maintenant qu'un nouveau carnet de plongée a été créé, il est simple de lui
-ajouter des données. _Subsurface_ permet plusieurs façons pour ajouter des
-données de plongée au carnet. Plus de détails dans les sections suivantes.
-
+Now that a new logbook is created, it is simple to add dive data it.
+_Subsurface_ allows several ways of adding dive data to a logbook.
 1) Si l'utilisateur possède un carnet manuscrit, un tableur ou une autre forme
    de
  carnet maintenu manuellement, les données de plongée peuvent être ajoutées
  au carnet en utilisant une des approches suivantes :
-
- - Entrer les informations de plongée à la main. Cela est utile si le plongeur
-   n'a pas
+ - Enter dive information by hand. This is useful if the diver didn’t
  utilisé d'ordinateur de plongée et que les plongées sont inscrites dans un
  carnet manuscrit. Voir  xref:S_EnterData[Entrer les informations de plongée
  à la main]
@@ -218,12 +194,9 @@ données de plongée au carnet. Plus de détails dans les sections suivantes.
  soit dans un fichier CSV. Se reporter à : xref:S_Appendix_D[ANNEXE D :
  Exporter un tableur vers le format CSV] et à
  xref:S_ImportingCSVDives[Importer des plongées au format CSV].
-
-2) Si les plongées ont été enregistrées en utilisant un ordinateur de plongée,
-   le profil de profondeur de la
- plongée et de nombreuses informations supplémentaires peuvent être
- utilisées. Ces plongées peuvent être importées à partir de :
-
+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:
  - L'ordinateur de plongée lui-même. Voir : xref:S_ImportDiveComputer[Importer
    de nouvelles informations de plongée à partir de l'ordinateur de plongée] ou
 
@@ -231,9 +204,7 @@ données de plongée au carnet. Plus de détails dans les sections suivantes.
    plongée. Voir
  xref:S_ImportingAlienDiveLogs[Importer les informations à partir d'autres
  sources de données numériques ou d'autres formats de données].
-
- - Importer à partir d'un tableur ou de fichiers CSV contenant les profils de
-   plongées.
+ - Spreadsheet or CSV files containing dive profiles.
  Voir : xref:S_ImportingCSVDives[Importer les plongées au format CSV à partir
  des ordinateurs de plongées ou d'autres logiciels de carnet de plongée]
 
@@ -244,19 +215,18 @@ données de plongée au carnet. Plus de détails dans les sections suivantes.
 This is usually the approach for dives without a dive computer. The basic
 record of information within _Subsurface_ 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
+duration, depth, the names of your dive buddy and the dive master or dive
 guide, and some remarks about the dive. _Subsurface_ can store much more
-information than this for each dive. In order to add a dive to a dive log,
-select _Log -> Add Dive_ from the Main Menu. The program then shows three
-panels to enter information for a dive: two tabs in the *Info* panel
-(*Notes* and *Equipment*), as well as the *Dive Profile* panel that displays
-a graphical profile of each dive. These panels are respectively marked
-[red]#A#, [red]#B# and [red]#C# in the figure below. Each of these tabs will
-now be explained for data entry.
+information for each dive.  To add a dive to a dive log, select _Log -> Add
+Dive_ from the Main Menu. The program then shows three panels on which to
+enter information for a dive: two tabs in the *Info* panel (*Notes* and
+*Equipment*), as well as the *Dive Profile* panel that displays a graphical
+profile of each dive. These panels are respectively marked [red]#A#,
+[red]#B# and [red]#C# in the figure below. Each of these tabs will now be
+explained for data entry.
 
 image::images/AddDive1_f22.jpg["FIGURE: Add dive", align="center"]
-
-When one edits a field in Notes or Equipment panels, _Subsurface_ enters
+When you edit a field in Notes or Equipment panels, _Subsurface_ enters
 *Editing Mode*, indicated by the message in the blue box at the top of the
 *Notes* panel (see the image below). This message is displayed in all the
 panels under Notes and Equipment when in *Editing Mode*.
@@ -267,56 +237,54 @@ The _Apply changes_ button should only be selected after all the parts of a
 dive have been entered.  When entering dives by hand, the _Info_,
 _Equipment_ and _Profile_ tabs should be completed before saving the
 information. By selecting the _Apply changes_ button, a local copy of the
-information for this specific dive is saved in memory. When one closes
-Subsurface, the program will ask again, this time whether the complete dive
-log should be saved on disk or not.
+information for this specific dive is saved in memory. The _Apply changes_
+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.
 
 [[S_CreateProfile]]
 ==== Creating a Dive Profile
 
 The *Dive Profile* (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
 _Subsurface_ window. When a dive is manually added to a logbook,
 _Subsurface_ presents a default dive profile that needs to be modified to
-best represent the dive being described:
+best represent the dive described:
 
 image::images/DiveProfile1_f20.jpg["FIGURE: Initial dive profile", align="center"]
 
 _Modifying the dive profile_: When the cursor is moved around the dive
-profile, its position is indicated by two right-angled red lines as shown
-below.  The time and depth represented by the cursor are indicated at the
-top of the black information box (@ and D). The units (metric/imperial) on
-the axes are determined by the *Preference* settings. The dive profile
-itself comprises several line segments demarcated by waypoints (white dots
-on the profile, as shown above). The default dive depth is 15 m.  If the
-dive depth was 20 m then the user needs to drag the appropriate waypoints
-downwards to represent 20 m. To add a waypoint, double-click on any line
-segment. To move an additional waypoint, drag it.  To remove this waypoint,
-right-click on it and choose "Remove this point" from the context menu. Drag
-the waypoints to represent an accurate time duration for the dive. Below is
-a dive profile for a dive to 20 m for 30 min, followed by a 5 minute safety
-stop at 5 m.
+profile, 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 *Preference* 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 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 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 to 20 m for
+30 min, followed by a 5 minute safety stop at 5 m.
 
 image::images/DiveProfile2_f20.jpg["FIGURE: Edited dive profile", align="center"]
 
-_Specifying the gas composition:_ The gas composition used is clearly
-indicated along the line segments of the dive profile. This defaults to the
-first gas mixture specified in the *Equipment* tab, which was air in the
-case of the profile above. The gas mixtures of segments of the dive profile
-can be edited. This is done by right-clicking on the particular waypoint and
-selecting the appropriate gas from the context menu. Changing the gas for a
-waypoint affects the gas shown in the segment _to the left_ of that
-waypoint. Note that only the gases defined in the *Equipment* tab appear in
-the context menu (see image below).
+_Specifying the gas composition:_ The gas composition used is indicated
+along the line segments of the dive profile. This defaults to the first gas
+mixture specified in the *Equipment* tab, which was air in the case of the
+profile above. The gas mixtures of segments of the dive profile can 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 _to the left_ of that waypoint. Note
+that only the gases defined in the *Equipment* tab appear in the context
+menu (see image below).
 
 image::images/DiveProfile3_f20.jpg["FIGURE: Gas composition context menu", align="center"]
 
-With the profile having been defined, more details must be added in order to
-have a fuller record of the dive. To do this, the *Notes* and the
-*Equipment* tabs on the top left hand of the _Subsurface_ window should be
-used. Click on xref:S_Notes_dc[*this link*] for instructions to use these
-tabs.
-
+With the profile now defined, more details must be added to have a fuller
+record of the dive. To do this, the *Notes* and the *Equipment* tabs on the
+top left hand of the _Subsurface_ window should be used. Click on
+xref:S_Notes_dc[*this link*] for instructions on how to use these tabs.
 [[S_ImportDiveComputer]]
 === Importer de nouvelles informations de plongée à partir de l'ordinateur de plongée
 
@@ -325,37 +293,36 @@ tabs.
 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. _Subsurface_ can
-capture this information and present it as part of the dive information,
-using dive information from a wide range of dive computers. The latest list
-of supported dive computers can be found at:
+capture this information, using dive details from a wide range of dive
+computers. The latest list of supported dive computers can be found at:
 link:http://subsurface-divelog.org/documentation/supported-dive-computers/[
 Supported dive computers].
 
 [icon="images/icons/warning2.png"]
 [WARNING]
-Several dive computers consume more power when they are in their
-PC-Communication mode. **This could drain the dive computer's battery**. We
-therefore recommend that the user checks if the dive computer is charged
-when connected to the USB port of a PC. For example, several Suunto and
-Mares dive computers do not recharge through the USB connection. Users
-should refer to the dive computer's manual if they are unsure whether the
-dive computer recharges its batteries while connected to the USB port.
+Several dive computers consume more power when they are in PC-Communication
+mode. **This could drain the dive computer's battery**. We 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's manual if they are unsure whether the dive computer recharges its
+batteries while connected to the USB port.
 
 To import dive information from a dive computer to a computer with
-_Subsurface_, it is necessary that the two pieces of equipment communicate
-with one another.  This involves setting up the communications port (or
-mount point) of the computer with _Subsurface_ that communicates with the
-dive computer. In order to set up this communication, one needs to find the
-appropriate information to instruct _Subsurface_ where and how to import the
-dive information.
+_Subsurface_, the two pieces of equipment must communicate with one
+another.  This involves setting up the communications port (or mount point)
+of the computer with _Subsurface_ that communicates with the dive
+computer. To set up this communication, users need to find the appropriate
+information to instruct _Subsurface_ where and how to import the dive
+information.
 xref:_appendix_a_operating_system_specific_information_for_importing_dive_information_from_a_dive_computer[Appendix
-A] provides the technical information to help the user achieving this for
+A] provides the technical information to help the user achieve this for
 different operating systems and
 xref:_appendix_b_dive_computer_specific_information_for_importing_dive_information[Appendix
 B] has dive computer specific information.
 
-After this, the dive computer can be hooked up to the user's PC, which can
-be achieved by following these steps:
+After this, the dive computer can be hooked up to the user's PC using these
+steps:
 
 1. The interface cable should be connected to a free USB port (or the Infra-red
 	or Bluetooth connection set up as described later in this manual)
@@ -369,12 +336,12 @@ be achieved by following these steps:
 
 image::images/DC_import_f20.jpg["FIGURE: Download dialogue 1", align="center"]
 
-Dive computers tend to keep a certain number of dives in their memory, even
-though these dives have already been imported to _Subsurface_. For that
-reason, if the dive computer allows this, _Subsurface_ only imports dives
-that have not been uploaded before. This makes the download process faster
-on most dive computers and also saves battery power of the dive computer (at
-least for those not charging while connected via USB).
+Dive computers tend to keep a certain number of dives in memory, even though
+these dives have already been imported to _Subsurface_. For that reason, if
+the dive computer allows this, _Subsurface_ only imports dives that have not
+been uploaded before. This makes the download process faster on most dive
+computers and also saves battery power of the dive computer (at least for
+those not charging while connected via USB).
 
  - The dialogue has two drop-down lists, *Vendor* and *Dive Computer*. On the
    *vendor* drop-down list select the make of the computer, e.g.  Suunto,
@@ -389,16 +356,15 @@ least for those not charging while connected via USB).
    A] and
    xref:_appendix_b_dive_computer_specific_information_for_importing_dive_information[Appendix
    B] for technical details on how to find the appropriate port information for
-   a particular dive computer and, in some cases, how to do the correct
-   settings to the operating system of the computer on which _Subsurface_ is
-   running.
+   a specific dive computer and, in some cases, how to do the correct settings
+   to the operating system of the computer on which _Subsurface_ is running.
 
  - If all the dives on the dive computer need to be downloaded, check the
    checkbox _Force download of all dives_. Normally, _Subsurface_ only
    downloads dives after the date-time of the last dive in the *Dive List*
-   panel. If one or more of your dives in _Subsurface_ have been accidentally
+   panel. If one or more of your dives in _Subsurface_ 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
+   the dive computer, this box needs to be checked. Some dive computers
    (e.g. Mares Puck) do not provide a contents list to _Subsurface_ 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
@@ -407,37 +373,36 @@ least for those not charging while connected via USB).
  - If the checkbox _Always prefer downloaded dives_ has been checked and,
    during download, dives with identical date-times exist on the dive computer
    and on the _Subsurface_ *Dive List* panel, the dive in the _Subsurface_
-   divelog will be overwritten by the dive record from the dive computer.
+   divelog will be overwritten by the dive record from the computer.
 
  - The checkbox marked _Download into new trip_ ensures that, after upload, the
    downloaded dives are grouped together as a new trip(s) in the *Dive List*.
 
  - Do *not* check the checkboxes labelled _Save libdivecomputer logfile_ and
    _Save libdivecomputer dumpfile_. These are only used as diagnostic tools
-   when problems with downloads are experienced (see below).
-
- - Then select the _Download_ button.  With communication established, one can
+   when there are problems with downloads(see below).
+ - Then select the _Download_ button.  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 _Download_ 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
-   *B* 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
-   *B*, above). Each dive comprises a row in the table, with the date, duration
-   and depth shown. Next to each dive is a checkbox: check all the dives that
-   need to be transferred to the *Dive List*. In the case of the image above,
-   the last six dives are checked and will be transferred to the *Dive
-   List*. Then click the _OK_ button at the bottom of the dialogue. All the
-   imported dives appear in the *Dive List*, sorted by date and
-   time. Disconnect and switch off the dive computer to conserve its battery
-   power.
+   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 *B* 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 *B*, above). Each dive comprises a row in the table,
+   with the date, duration and depth shown. Next to each dive is a checkbox:
+   check all the dives that need to be transferred to the *Dive List*. In the
+   case of the image above, the last six dives are checked and will be
+   transferred to the *Dive List*. Then click the _OK_ button at the bottom of
+   the dialogue. All the imported dives appear in the *Dive List*, sorted by
+   date and time. Disconnect and switch off the dive computer to conserve its
+   battery power.
 
 
 
-After this has been completed, select the OK button.  The checked dives are
-transferred to the *Dive List*.
+Then click the OK button.  The checked dives are transferred to the *Dive
+List*.
 
  - If there is a problem in communicating with the dive computer, an error
    message will be shown, similar to this text: "Unable to open /dev/ttyUSB0
@@ -452,38 +417,37 @@ Check the following:
 
  - Is the dive computer still in PC-communication or Upload mode?
 
- - 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.
 
- - Is the connecting cable faulty? Does the cable work perfectly using other
-   software? Has it worked before, or is this the first time the cable is being
-   used? Are the contacts on the dive computer and the cable clean?
+ - 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?
 
  - Consult
    xref:_appendix_a_operating_system_specific_information_for_importing_dive_information_from_a_dive_computer[Appendix
-   A] and make sure that the correct Mount Point was specified (see above).
+   A] to be sure the correct Mount Point was specified (see above).
 
  - On Unix-like operating systems, does the user have write permission to the
    USB port? If not, consult
    xref:_appendix_a_operating_system_specific_information_for_importing_dive_information_from_a_dive_computer[Appendix
    A]
 
-If the _Subsurface_ computer does not recognise the USB adaptor by showing
+If the _Subsurface_ 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
-_Subsurface_ computer. It is also possible that the _Subsurface_ computer
-cannot interpret the data. Perform a download for diagnostic purposes with
-the following two check boxes checked in the download dialogue discussed
-above:
+possibility the cable or USB adaptor is faulty. A faulty cable is the most
+common cause of communication failure between a dive computer and
+_Subsurface_ computer. It’s also possible the _Subsurface_ computer cannot
+interpret the data. Perform a download for diagnostic purposes with the
+following two boxes checked in the download dialogue discussed above:
 
 	Save libdivecomputer logfile
 	Save libdivecomputer dumpfile
 
 *Important*: 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 _Subsurface_
+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
+_Subsurface_
 dive log is kept.
 
 *Important:* _After downloading with the above checkboxes
@@ -495,7 +459,7 @@ checked, no dives are added to the
 
 These files should be send to the _Subsurface_ mail list:
 _subsurface@subsurface-divelog.org_ with a request for the files to be
-analysed. Provide the dive computer make and model as well as contextual
+analyzed. Provide the dive computer make and model as well as contextual
 information about the dives recorded on the dive computer.
 ****
 
@@ -504,60 +468,52 @@ information about the dives recorded on the dive computer.
 [icon="images/icons/bluetooth.jpg"]
 
 Bluetooth is becoming a more common way of communication between dive
-computers and _Subsurface_, for instance, the Shearwater Petrel Mk2 and the
-OSTC Mk3. _Subsurface_ provides a largely operating system independent
+computers and _Subsurface_, for or instance, the Shearwater Petrel Mk2 and
+the OSTC Mk3. _Subsurface_ provides a largely operating system independent
 Bluetooth interface. Setting up _Subsurface_ for Bluetooth communication
 requires four steps:
 
-- Ensure that Bluetooth is activated on the host computer running
-  _Subsurface_.
-- Ensure that _Subsurface_ sees the Bluetooth adapter on the host computer.
-- Ensure the Bluetooth-enabled dive computer is Bluetooth-discoverable and in
+- Be sure Bluetooth is activated on the host computer running _Subsurface_.
+- Be sure _Subsurface_ sees the Bluetooth adapter on the host computer.
+- Be sure the Bluetooth-enabled dive computer is Bluetooth-discoverable and in
   PC upload mode.
-- Ensure that _Subsurface_ is paired with the Bluetooth-enabled dive computer.
+- Be sure _Subsurface_ is paired with the Bluetooth-enabled dive computer.
 
 Select the Download dialogue by selecting _Import -> Import from dive
-computer_ from the *Main Menu*. If one checks the check box labelled
-_"Choose Bluetooth download mode"_, the dialogue below appears.
-
+computer_ from the *Main Menu*. If you check the box labelled _"Choose
+Bluetooth download mode"_, the dialogue below appears.
 ===== Sur Linux ou MacOS :
 
 image::images/DC_import_Bluetooth.jpg["FIGURE: Download Bluetooth", align="center"]
 
 On the _Linux_ or _MacOS_ platforms the name of the _Subsurface_ computer
-and its Bluetooth address are shown on the right-hand side, On the lefthand
+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
 _Subsurface_.  The power state (on/off) of the Bluetooth adapter is shown
-below the address and can be changed by checking the _Turn on/off_ check
-box.
-
-If the Bluetooth address is not shown, then _Subsurface_ does not see the
-local Bluetooth device. Ensure that the Bluetooth driver is installed
-correctly on the _Subsurface_ computer and check if it can be used by other
-Bluetooth utilities like _bluetoothctl_ or _bluemoon_. This achieves the
-first two steps above.
-
-Ensure that the Bluetooth-enabled dive computer is in PC-upload mode and
-that it is discoverable by other Bluetooth devices. Consult the manual of
-the dive computer to perform this. Now the third item in the list above has
-been achieved.
-
-Select the _Scan_ button towards the bottom left of the dialogue
-above. After searching for a small amount of time, the dive computer should
-be listed (perhaps as one of a number of Bluetooth devices) in the main list
-box on the lefthand side of the dialogue (see image above). If this is not
-achieved, select the _Clear_ button and then scan again for Bluetooth
-devices using the _Scan_ button. After performing these actions _Subsurface_
-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 _Pair_
-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.
+below the address and can be changed by checking the _Turn on/off_ box.  If
+the Bluetooth address is not shown, then _Subsurface_ does not see the local
+Bluetooth device. Be sure the Bluetooth driver is installed correctly on the
+_Subsurface_ computer and check if it can be used by other Bluetooth
+utilities like _bluetoothctl_ or _bluemoon_. 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 for more information. Now the third item in the list
+above has been finished.  Select the _Scan_ 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 does not work,
+select the _Clear_ button, then scan again for Bluetooth devices using the
+_Scan_ button. After taking these actions _Subsurface_ should see the dive
+computer.  The label of the discovered dive computer contains the name of
+the device, its address and its pairing status. If the device is not paired
+and has a red background color, a context menu can be opened by selecting
+the item with a right-click.  Select the the _Pair_ 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.
 
 ****
 [icon="images/icons/important.png"]
@@ -580,41 +536,40 @@ One way to achieve this is to use +bluetoothctl+:
 	[agent] Enter PIN code: 0000
 ****
 
-After the devices are paired the _Save_ button of the dialogue can be
-pressed.  This closes the Bluetooth dialogue. Now select _Download_ in the
-_Download from dive computer_ dialogue which should still be open. The
-downloaded dives are shown on the righthand side of the download dialogue.
+After the devices are paired, press the _Save_ button of the dialogue.  This
+closes the Bluetooth dialogue. Now select _Download_ in the _Download from
+dive computer_ dialogue which should still be open. The downloaded dives are
+shown on the righthand side of the download dialogue.
 
 ===== Sur Windows :
 image::images/DC_import_Bluetooth_Windows.png["FIGURE: Download Bluetooth on Windows", align="center"]
 
 On _Windows_ platforms the _Local Bluetooth device details section_ on the
-right is not displayed as is the case on the Linux/Mac implementations.  To
-successfully initiate a scan (by pressing the _Scan_ button)  check that the
-Bluetooth device on the _Subsurface_ 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.
+right is not displayed as is the case on the Linux/Mac systems.  To start a
+scan (by pressing the _Scan_ button)  check that the Bluetooth device on the
+_Subsurface_ 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.
 
 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: _Add a
-device, Tap to set up your DC device_. Always allow this pairing. After a
-discovered item is selected, select the _Save_ button.  Finally select the
-_Download_ button on the _Download_ dialogue and wait for the process to
-complete.
+permission and put a message on the right side of the screen: _Add a device,
+Tap to set up your DC device_. Always allow this pairing. After a discovered
+item is selected, select the _Save_ button.  Finally select the _Download_
+button on the _Download_ dialogue and wait for the process to complete.
 
 [icon="images/icons/important.png"]
 [IMPORTANT]
 Currently _Subsurface_ works only with local Bluetooth adapters which use
 Microsoft Bluetooth Stack. If the local device uses _Widcomm_, _Stonestreet
-One Bluetopia Bluetooth_ or _BlueSoleil_ drivers it will definitely not
-work. However, Bluetooth hardware/dongles from these manufacturers
-(e.g. iSonic) that support the Microsoft Bluetooth Stack do work.
+One Bluetopia Bluetooth_ or _BlueSoleil_ drivers it will not work. However,
+Bluetooth hardware/dongles from these manufacturers (e.g. iSonic) that
+support the Microsoft Bluetooth Stack do work.
 
-A log messageOn the bottom left of the _Remote Bluetooth device selection_
+A log message on the bottom left of the _Remote Bluetooth device selection_
 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 _"Choose Bluetooth download
@@ -635,59 +590,58 @@ with _Subsurface_.
 ==== Changing the name of a dive computer
 
 It may be necessary to distinguish between different dive computers used to
-upload dive logs to _Subsurface_. For instance if one's partner's dive
-computer is the same make and model as one's own and dive logs are uploaded
-from both dive computers to the same _Subsurface_ computer, then one would
-perhaps like to call one dc "Alice's Suunto D4" and the other one "Bob's
-Suunto D4". Alternatively, consider a technical diver dives with two or more
-dive computers of the same model, the logs of both (or all) being uploaded.
-In this case it might be prudent to call one of them "Suunto D4 (1)" and
-another one "Suunto D4 (2)". This is easily done in _Subsurface_.  On the
-*Main Menu*, select _Log -> Edit device names_. A dialog opens, indicating
-the current Model, ID and Nickname of the dive computers used for
-upload. Edit the Nickname field for the appropriate dive computer. After
-saving the Nickname, the dive logs show the nickname for that particular
-device instead of the model name, allowing easy identification of devices.
+upload dive logs to _Subsurface_. 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 _Subsurface_ computer, then you might like to
+call one "Alice's Suunto D4" and the other "Bob'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 "Suunto D4
+(2)". This is easily done in _Subsurface_.  On the *Main Menu*, select _Log
+-> Edit device names_. 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, allowing
+easy identification of devices.
 
 [[S_EditDiveInfo]]
 ==== Updating the dive information imported from the dive computer.
 
 With the uploaded dives in the *Dive List*, the information from the dive
-computer is not complete and more details must be added in order to have a
-fuller record of the dives. To do this, the *Notes* and the *Equipment* tabs
-on the top left hand of the _Subsurface_ window should be used.
+computer is not complete and more details must be added to have a full
+record of the dives. To do this, the *Notes* and the *Equipment* tabs on the
+top left hand of the _Subsurface_ window should be used.
 
 [[S_Notes_dc]]
 ===== Notes
 
-To have a more complete dive record the user needs to add additional
+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.
 
-In some cases, one has to provide the date and time of the dive, e.g. when
-entering a dive by hand or when a dive computer does not provide the date
-and time of the dive.  (Usually the date and time of the dive, gas mixture
-and water temperature are shown as obtained from the dive computer)  If the
-contents of the *Notes tab* is changed or edited in any way, the message in
-a blue box at the top of the panel indicates that the dive is being
-edited. If one clicks on the *Notes* tab, the following fields are visible
+In some cases, 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 *Notes tab* is changed or edited in any way, the
+message in a blue box at the top of the panel shows the dive is being
+edited. If you click on the *Notes* tab, the following fields are visible
 (left hand image, below):
 
 image::images/AddDive3_f22.jpg["FIGURE: The Notes tab", align="center"]
 
 The right hand image, above, shows a *Notes tab* filled with dive
 information.  The *Time* field reflects the date and time of the dive. By
-clicking the date, a calendar is displayed from which one can choose the
+clicking the date, a calendar is displayed from which 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.
 
 *Air/water temperatures*: 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
 _Subsurface_ (following the _Preferences_, metric or imperial units will
@@ -697,50 +651,47 @@ be used).
 [icon="images/icons/warning2.png"]
 [WARNING]
 Dive locations are managed as a *separate* part of the dive log.  The dive
-information in the *Notes* and *Equipment* tabs can therefore not be edited
+information in the *Notes* and *Equipment* 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 _Apply changes_ on the *Notes* tab before editing the dive site
-information. Only then, supply a dive site name in the textbox labelled
-_Location_ on the *Notes* tab.
-
-Type the name of the dive site, e.g. "Tihany, Lake Balaton, Hungary".  If
-several dives are performed at the same location, the dive site information
-for the first dive is re-used.  Existing dive location information can be
-edited at any time by selecting (on the *Dive List* panel) a dive performed
-at that site and by opening the location information by clicking the globe
-button on the right of the location name (see image on the right,
-above). When entering a dive location name, auto location of dive site names
-makes it easy to select an existing dive site name (i.e. when typing the
-name of a dive site, a dropdown list appears showing all sites with similar
-names). If the dive site has been used before, click on the already-existing
-name.  The dive site names in the dropdown list contain either a globe
-symbol (indicating existing dive sites in the _Subsurface_ database)  or a
-*+* symbol (indicating dive site names that appear consistent with the
-current dive site name but which have not been added to the dive site
-database).  Therefore, if the present dive site has not been used before, a
-message appears as follows (image *A* below):
+by selecting _Apply changes_ on the *Notes* tab BEFORE editing the dive site
+information. Then supply a dive site name in the textbox labelled _Location_
+on the *Notes* tab.
+
+Type in the name of the dive site, e.g. "Tihany, Lake Balaton, Hungary".  If
+several dives are 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 *Dive List* 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.  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
+_Subsurface_ database)  or a *+* symbol (indicating dive site names that
+appear consistent with the 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 *A* below):
 
 image::images/Locations1_f22.jpg["FIGURE:Location description panel", align="center"]
 
 Doubleclick on the new dive site name. A panel appears to enter the
-coordinates and other important information about the site (image *B*,
-above). The most important items are the coordinates of the site. There are
-three ways of specifying the coordinates:
-
-a. One can find the coordinates on the world map in the bottom right hand part
-   of the _Subsurface_ window. The map displays an orange bar indicating "No
-   location data - Move the map and double-click to set the dive
-   location". Upon a doubleclick at the appropriate place, the orange bar
-   disappears and the coordinates are stored.
-
-b. The coordinates can be obtained from the _Subsurface_ 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.  xref:S_Companion[Click here for
-   more information]
-
-c. The coordinates can be entered by hand if they are known, using one of four
-   formats with latitude followed by longitude:
+coordinates and other information about the site (image *B*, above). The
+most important items are the coordinates of the site. There are three ways
+to specify coordinates:
+
+a. Use the world map in the bottom right hand part of the _Subsurface_
+   window. The map displays an orange bar indicating "No location 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.
+
+b. Use the _Subsurface_ Companion app if you have an Android or iPhone device
+   with GPS and if the dive site coordinates were stored using it.
+   xref:S_Companion[Click here for more information]
+c. Enter by hand if the coordinates are known, using one of four formats with
+   latitude followed by longitude:
 
 	ISO 6709 Annex D format e.g. 30°13'28.9"N 30°49'1.5"E Degrees and decimal
 	minutes, e.g. N30° 13.49760' , E30° 49.30788' Degrees minutes seconds,
@@ -751,86 +702,85 @@ Southern hemisphere latitudes are given with a *S*, e.g. S30°, or with a
 negative value, e.g. -30.22496. Similarly western longitudes are given with
 a *W*, e.g. W07°, or with a negative value, e.g. -7.34323. Some keyboards
 don't have the degree sign (°). It can be replaced by a *d* like this: N30d
-W20d.  If both a dive site name and coordinates have been provided, Save the
+W20d.  If both a dive site name and coordinates have been provided, save the
 dive site information by selecting the button _Apply changes_ at the top of
 the panel.
 
-*Important*: GPS coordinates of a dive site are linked to the Location
-name - so *saving* a dive site with only coordinates and no dive site name
-causes unexpected behaviour (Subsurface will think that all of these
+*Important*: GPS coordinates of a dive site are linked to the location
+name - so *saving* 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).
 
 *Dive site name lookup:* 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 _Subsurface_ 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 _Subsurface_ 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 _Dive sites on same coordinates_") 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.
+sites named "Blue Hole", all of them are listed.
 
-Enter any other textual information about the dive site (Description and
+Enter any other contextual information about the dive site (Description and
 Notes), then select _Apply Changes_ to save the geolocation for this dive
-site. At a later stage the dive site information can be edited by clicking
-the globe icon to the right of the dive site name in the *Notes tab*.
+site.  The dive site information can later be edited by clicking the globe
+icon to the right of the dive site name in the *Notes tab*.
 
-*Dive mode*: 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),
+*Dive mode*: 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).
 
-*Divemaster*: The name of the dive master or dive guide for this dive should be
+*Divemaster*: 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.
 
-*Buddy*: In this field, one enters the name(s) of the buddy / buddies
-(separated with commas) who accompanied him/her on the
+*Buddy*: 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.
 
 *Suit*: 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.
+suit and thermal under suit was used.
 
-*Rating*: One can provide a subjective overall rating of the dive on a
+*Rating*: You can provide a subjective overall rating of the dive on a
 5-point scale by clicking the appropriate star on the rating scale.
 
-*Visibility*: Similarly, one can provide a rating of visibility during the
+*Visibility*: You can provide a rating of visibility during the
 dive on a
 5-point scale by clicking the appropriate star.
 
-*Tags*: Tags that describe the type of dive performed can be entered
+*Tags*: 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.
-_Subsurface_ has many built-in tags. If the user starts typing a tag, the
+_Subsurface_ 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
-+cav+, then the tags *cave* and *cavern* are shown for the user to choose from.
+will list the tags that correspond to the typing. For instance, by typing
++cav+, the tags *cave* and *cavern* are shown to choose from.
 
 *Notes*: Any additional information for the dive can be entered here.
 
 The _Apply changes_ and _Discard changes_ buttons are used to save all the
-information for tabs in the *Info* panel and in the *Dive Profile* panel, so
-there's no need to use them until *ALL* other information has been
-added. The image xref:S_Notes_dc[at the beginning of this section] shows an
-example of a *Notes tab* after completion of the dive information.
+information for tabs in the *Info* panel and in the *Dive Profile*
+panel. Use them when *ALL* other information has been added. The image
+xref:S_Notes_dc[at the beginning of this section] shows an example of a
+*Notes tab* after completing the dive information.
 
 ===== Equipment
 
-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
+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:
 
 image::images/BlueEditBar_f22.jpg["FIGURE: Blue edit bar", align="center"]
 
-indicates that the dive is being edited. This is a highly interactive part
-of _Subsurface_ and the information on cylinders and gases (entered here)
-determines the behaviour of the *Dive profile* (top right-hand panel).
+shows the dive is being edited. This is a highly interactive part of
+_Subsurface_ and the information on cylinders and gases (entered here)
+determines the behavior of the *Dive profile* (top right-hand panel).
 
 [[cylinder_definitions]]
 *Cylinders*: The cylinder information is entered through a dialogue that looks
@@ -839,23 +789,21 @@ like this:
 image::images/DC_gas-dialogue1_f20.jpg["FIGURE: Initial cylinder dialogue", align="center"]
 
 For hand-entered dives, this information needs to be typed in. For dive
-computers, _Subsurface_ often obtains the gas used from the dive computer
-and automatically inserts the gas composition(% oxygen or % helium) in the
-table. The + button at the top right allows the user to add more cylinders
-for this dive. The dark dustbin icon on the left allows the deletion of
-information for a cylinder.  Note that it is not possible to delete a
-cylinder if it is used during the dive. A cylinder might be implicitly used
-in the dive, even without a gas change event.
-
-The user should start by selecting a cylinder type on the left-hand side of
-the table.  To select a cylinder, the _Type_ box should be clicked. This
-brings up a list button that can be used to display a dropdown list of
-cylinders:
+computers, _Subsurface_ 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 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.  Start by selecting a cylinder type on the
+left-hand side of the table.  To select a cylinder, the _Type_ box should be
+clicked. This brings up a list button that can be used to display a dropdown
+list of cylinders:
 
 image::images/DC_gas-dialogue2_f20.jpg["FIGURE: The cylinder drop-down list button", align="center"]
 
 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
+used for this dive, or just start typing in the box which shows the
 available options for the entered characters. The *Size* of the cylinder as
 well as its working pressure (_Work.press_) will automatically be shown in
 the dialogue.
@@ -871,14 +819,14 @@ inappropriate fields should be left empty. After typing the information for
 the cylinder, save the data either by pressing _ENTER_ on the keyboard or by
 clicking outside the cell containing the cursor. Information for any
 additional cylinders can be added by using the + button at the top right
-hand. Following is an example of a complete description for a dive using two
-cylinders (air and EAN50):
+hand. The following is an example of a complete description for a dive using
+two cylinders (air and EAN50):
 
 image::images/CylinderDataEntry3_f20.jpg["FIGURE: a completed cylinder dive information table", align="center"]
 
 *Weights*: 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:
 
@@ -889,44 +837,44 @@ a down-arrow:
 
 image::images/WeightsDataEntry2_f20.jpg["FIGURE:Weights type drop-down list button", align="center"]
 This can be used to select the type of weight system used during the dive or
-the user may start typing in the box to specify a different weighting
-mechanism that will be saved by _Subsurface_.  In the *Weight* field, type
-in the amount of weight used during the dive. After specifying the weight
-system, save the data by either pressing _ENTER_ on the keyboard or by
-clicking outside the cell with the cursor.  It is possible to enter
-information for more than one weight system by adding an additional system
-using the + button on the top right hand. Weight systems can be deleted
-using the dustbin icon on the left hand. Here is an example of information
-for a dive with two types of weights: integrated as well as a weight belt:
+just may start typing in the box to specify a different weighting mechanism
+that will be saved by _Subsurface_.  In the *Weight* field, type in the
+amount of weight used during the dive. After specifying the weight system,
+save the data by pressing _ENTER_ on the keyboard or by clicking outside the
+cell with the cursor.  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 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:
 
 image::images/WeightsDataEntry3_f20.jpg["FIGURE: A completed weights information table", align="center"]
 
 ==== Editing several selected dives simultaneously
 
 _METHOD 1_: After uploading dives from a dive computer, the dive profiles of
-each uploaded dive is shown in the *Dive profile* tab, as well as a few
-items of information in the *Notes* tab (e.g. water temperature) and in the
-*Equipment* tab (e.g. gas pressures and gas composition). However the other
-fields remain empty.  It may be useful to simultaneously edit some of the
-fields in the *Notes* and *Equipment* 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
-*Dive List* and insert the same information in the *Notes* and *Equipment*
-fields that need identical information. This is achieved by editing the dive
-notes or the equipment for any one of the selected dives.
-
-The simultaneous editing only works with fields that do not already contain
-information.  This means that, if some fields have been edited for a
-particular dive among the selected dives, these are not changed while
-editing the dives simultaneously. Technically, the rule for editing several
-dives simultaneously is: if the data field being edited contains _exactly
-the same information_ for all the dives that have been selected, the new,
-edited information is substituted for all the selected dives, otherwise only
-the edited dive is changed, even though several dives have been selected in
-the *Dive List*. This greatly speeds up the completion of the dive log after
-several similar dives.
+each is shown in the *Dive profile* tab, as well as a few items of
+information in the *Notes* tab (e.g. water temperature) and in the
+*Equipment* tab (e.g. gas pressures and gas composition). Other fields
+remain empty.  It may be useful to simultaneously edit some of the fields in
+the *Notes* and *Equipment* 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 *Dive List* and insert the same
+information in the *Notes* and *Equipment* fields that need identical
+information. This is done by editing the dive notes or the equipment for any
+one of the selected dives.
+
+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 _exactly the same
+information_ for all the dives that have been selected, the new, edited
+information is substituted for all the selected dives. Otherwise only the
+edited dive is changed, even though several dives have been selected in the
+*Dive List*. This speeds up the completion of the dive log after several
+similar dives.
 
 [[S_CopyComponents]]
 _METHOD 2_:There is a different way of achieving the same goal. Select a
@@ -942,14 +890,13 @@ log.
 
 ==== Adding Bookmarks to a dive
 
-Many divers wish to annotate their dives with text that indicate particular
-events during the dive, e.g. "Saw dolphins", or "Released surface
-buoy". This is easily done:
+Many divers wish to annotate dives with text that indicate particular
+events, e.g. "Saw dolphins", or "Released surface buoy". This is easily
+done:
 
  - Right-click at the appropriate point on the dive profile.  This brings up
    the dive profile context menu. Select _Add bookmark_. A red flag is placed
-   on the dive profile at the point that was initially selected (see *A*
-   below).
+   on the dive profile at that point (see *A* below).
 
  - Right-click on the red flag. This brings up the context menu (see *B*
    below). Select _Edit name_.
@@ -957,8 +904,8 @@ buoy". This is easily done:
  - A text box is shown. Type the explanatory text for the bookmark (see *C*
    below). Select _OK_.  This saves the text associated with the bookmark.
 
- - If one hovers using the mouse over the red bookmark, the appropriate text is
-   shown at the bottom of the information box (see *D* below).
+ - Hovering the mouse over the red bookmark, the appropriate text is shown at
+   the bottom of the information box (see *D* below).
 
 image::images/Bookmarks.jpg["FIGURE: Bookmark dialog", align="center"]
 
@@ -968,57 +915,54 @@ image::images/Bookmarks.jpg["FIGURE: Bookmark dialog", align="center"]
 The information entered in the *Notes* tab and the *Equipment* tab can be
 saved by using the two buttons on the top right hand of the *Notes* tab. If
 the _Apply changes_ button is clicked, the dive data are saved in the memory
-image of the dive. If the _Discard changes_ button is clicked, then the
-newly entered dive data are erased from the computer memory, although the
-dive profile is retained. When the user exits _Subsurface_ there is a final
-prompt to confirm that the new data should now be saved permanently on the
+image of the dive. If the _Discard changes_ button is clicked, the newly
+entered dive data are erased from the computer memory, although the dive
+profile is retained. When the user exits _Subsurface_ there is a final
+prompt to confirm the new data should now be saved permanently on the
 computer disk.
 
 === Importer les informations à partir d'autres sources de données numériques ou d'autres formats de données
 
 [[S_ImportingAlienDiveLogs]]
 
-If a user has been diving for some time, it is possible that several dives
-were logged using other dive log software. This information does not need
-retyping because these dive logs can probably be imported into
+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
 _Subsurface_. _Subsurface_ will import dive logs from a range of other dive
-log software. While some software is supported natively, for others the user
-has to export the logbook(s) to an intermediate format so that they can then
-be imported by _Subsurface_.  Currently, _Subsurface_ supports importing CSV
+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 _Subsurface_.  Currently, _Subsurface_ supports importing CSV
 log files from several sources.  APD LogViewer, XP5, Sensus and Seabear
 files are preconfigured, but because the import is flexible, users can
 configure their own imports.  Manually kept log files (e.g. a spreadsheet)
 can also be imported by configuring the CSV import.  _Subsurface_ can also
-import UDDF and UDCF files used by some divelog software and some dive
-computers, like the Heinrichs & Weikamp DR5. Finally, for some divelog
-software like Mares Dive Organiser it is currently suggested to import the
-logbooks first into a webservice like _divelogs.de_ and then import them
-from there with _Subsurface_, as divelogs.de supports a few additional
-logbook formats that _Subsurface_ currently cannot parse.
-
-If the format of other software is supported natively on Subsurface, it
-should be sufficient to select either _Import -> Import log files_ or _File
--> Open log file_. _Subsurface_ supports the data formats of many dive
-computers, including Suunto and Shearwater. When importing dives,
-_Subsurface_ 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) _Subsurface_ will not create duplicate
-entries. Below follows more specific information to achieve data import to
-_Subsurface_.
-
+import UDDF and UDCF files used by some dive log software and some dive
+computers, like the Heinrichs & Weikamp DR5. Finally, for some dive log
+software like Mares Dive Organizer we currently recommend you import the
+logbooks first into a web service like _divelogs.de_ and then import from
+there with _Subsurface_. Divelogs.de supports a few additional logbook
+formats that _Subsurface_ currently cannot handle.
+
+If the format of other software is supported natively on Subsurface, select
+either _Import -> Import log files_ or _File -> Open log file_. _Subsurface_
+supports the data formats of many dive computers, including Suunto and
+Shearwater. When importing dives, _Subsurface_ 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) _Subsurface_ will
+not create duplicate entries. Below is more specific information to import
+data to _Subsurface_.
 ==== Using the universal import dialogue
 [[Unified_import]]
 
-Importing dives from other software is performed through a universal
-interface activated by selecting _Import_ from the Main Menu, then clicking
-on _Import Log Files_. This brings up dialogue *A*, below.
+Importing dives from other software is done through a universal interface
+activated by selecting _Import_ from the Main Menu, then clicking on _Import
+Log Files_. This brings up dialogue *A*, below.
 
 image::images/Import1_f20.jpg["FIGURE: Import dialogue: step 1", align="center"]
 
 Towards the bottom right is a dropdown selector with a default label of
-_Dive Log Files_ which gives access to the different types of direct imports
-available, as in dialogue *B*, above. Currently these are:
+_Dive Log Files_ which accesses different types of direct imports available,
+as in dialogue *B*, above. Currently these are:
 
  - XML-formatted dive logs (DivingLog 5.0, MacDive and several other dive log
    systems)
@@ -1035,8 +979,8 @@ available, as in dialogue *B*, above. Currently these are:
  - CSV (text-based and spreadsheet-based) dive logs, including APD CCR logs
 
 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 _Subsurface_ *Dive List*. Some other formats, not
+window containing the file list on the right of the dialogue, opens the
+imported dive log in the _Subsurface_ *Dive List*. Some other formats not
 accessible through the Import dialogue are also supported, as explained
 below.
 
@@ -1051,33 +995,34 @@ select _OSTCTools Files (.dive .DIVE)_. This makes the _OSTC Tools_ dive
 logs visible in the file list panel. Select one or more dive, then click the
 _Open_ button. The OSTC dives are shown in the *Dive List* panel.
 
-Actually, all H&W devices supported by OSTCTools can be imported to
-_Subsurface_, this includes OSTC, OSTC Mk2, OSTC 2N/2C, OSTC3, OSTC Sport,
-and probably although untested, Frog, OSTC2 and OSTC CR.
+All H&W devices supported by OSTCTools can be imported to _Subsurface_. This
+includes OSTC, OSTC Mk2, OSTC 2N/2C, OSTC3, OSTC Sport, and probably
+although untested, Frog, OSTC2 and OSTC CR.
 
-Please, remember that OSTCTools is *not* 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
-_Subsurface_; one has to to manually complete the rest of data which may be
-important (buddies, equipment, notes, etc).
+Please remember that OSTCTools is *not* 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 _Subsurface_; you
+have to manually complete the rest of the data you want (buddies, equipment,
+notes, etc).
 
 
-==== Importing from Mares Dive Organiser V2.1
+==== Importing from Mares Dive Organizer V2.1
 
-Since Mares utilise proprietary Windows software not compatible with
+Since Mares uses proprietary Windows software not compatible with
 multi-platform applications, these dive logs cannot be directly imported
 into _Subsurface_. Mares dive logs need to be imported using a three-step
-process, using _www.divelogs.de_ as a mechanism to extract the dive log
+process, using _www.divelogs.de_ as a gateway to extract the dive log
 information.
 
-1. Export the dive log data from Mares Dive Organiser to the user's desktop,
-   using a _.sdf_ file name extension. Refer to xref:Mares_Export[Appendix C]
-   for more information.
-2. Data should then be imported into _www.divelogs.de_. One needs to create a
-   user account in _www.divelogs.de_, log into that web site, then select
-   _Import Logbook -> Dive Organiser_ from the menu on the left hand side.  The
-   instructions must be carefully followed to transfer the dive information (in
-   _.sdf_ format) from the Dive Organiser database to _www.divelogs.de_.
+1. Export the dive log data from Mares Dive Organizer to your desktop, using a
+   _.sdf_ file name extension. Refer to xref:Mares_Export[Appendix C] for more
+   information.
+2. Data should then be imported into _www.divelogs.de_. You will first need to
+   create a user account in _www.divelogs.de_.  Log into that web site, then
+   select _Import Logbook -> Dive Organizer from the menu on the left hand
+   side.  The instructions must be carefully followed to transfer the dive
+   information (in _.sdf_ format) from the Dive Organizer database to
+   _www.divelogs.de_.
 3. Finally, import the dives from _divelogs.de_ to _Subsurface_, using the
    instructions below.
 
@@ -1085,15 +1030,15 @@ information.
 [[S_ImportingDivelogsDe]]
 ==== Importing dives from *divelogs.de*
 
-The import of dive information from _divelogs.de_ is simple, using a single
+Importing dive information from _divelogs.de_ is simple, using a single
 dialogue box. The _Import -> Import from Divelogs.de_ option should be
 selected from the Main Menu. This brings up a dialogue box (see image *A*
-below). Enter a user-ID and password for _divelogs.de_ into the appropriate
-fields and then select the _Download_ button. Download from _divelogs.de_
-starts immediately, displaying a progress bar in the dialogue box. At the
-end of the download, the success status is indicated (see image *B*,
-below). The _Apply_ button should then be selected, after which the imported
-dives appear in the _Subsurface_ *Dive List* panel.
+below). Enter a user-ID and password for _divelogs.de_ and then select the
+_Download_ button. Download from _divelogs.de_ starts immediately,
+displaying a progress bar in the dialogue box. At the end of the download,
+the success status is shown (see image *B*, below). The _Apply_ button
+should then be selected, after which the imported dives appear in the
+_Subsurface_ *Dive List* panel.
 
 image::images/Divelogs1.jpg["FIGURE:Download from Divelogs.de", align="center"]
 
@@ -1104,7 +1049,7 @@ 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 _CSV_ format is a universal simplified format that
-allows for easy information exchange between different computers or software
+allows easy information exchange between different computers or software
 packages. For an introduction to CSV-formatted files see xref:S_CSV_Intro[A
 Diver's Introduction To CSV Files]. _Subsurface_ dive logs can also be
 exported in _CSV_ format to other software that reads this format. See
@@ -1115,8 +1060,8 @@ _Subsurface_.
 [[S_ImportingCSVDives]]
 ===== Importer les plongées au format CSV à partir des ordinateurs de plongées ou d'autres logiciels de carnet de plongée
 
-One can view a _CSV_ file by using an ordinary text editor. It is normally
-organised into a single line that provides the headers (or _field names_ or
+You can view a _CSV_ file by using an ordinary text editor. It’s normally
+organized into a single line that provides the headers (or _field names_ or
 _column headings_) of the data columns, followed by the data, one record per
 line.
 
@@ -1125,22 +1070,22 @@ _Subsurface_:
 
 1. _CSV dive details_: This dive log format contains similar information to
    that of a typical written dive log, e.g. dive date and time, dive depth,
-   dive duration, names of buddy and dive master and perhaps some information
-   about cylinder pressures before and after the dive, as well as a comment or
-   two about the dive. All the data for a single dive go on a single line of
-   text, following the order of the column headings.
+   dive duration, names of 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.
 
 2. _CSV dive profile_: This dive log format includes much more information
    about a single dive. For instance there may be information at 30-second
-   intervals, indicating depth, water temperature at that depth, and cylinder
-   pressure at that moment in time. Each line contains the information for a
-   single instant in time during the dive, 30 seconds after that of the
-   previous instant. Many lines are required to complete the depth profile
-   information for a single dive. This is a common export format used by
-   closed-circuit rebreather (CCR) dive equipment and many software packages
-   that handle dive computer data and/or dive logs.
-
-Before being able to import the _CSV_ data to _Subsurface_ *one needs to
+   intervals, indicating depth, water 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 export format used by closed-circuit rebreather (CCR)
+   dive equipment and many software packages that handle dive computer data
+   and/or dive logs.
+
+Before being able to import the _CSV_ data to _Subsurface_ *you needs to
 know a few things about the data being imported*:
 
 a. Which character separates the different columns within a single line of
@@ -1158,7 +1103,7 @@ b. Which data columns need to be imported into _Subsurface_? Is it a _CSV dive
 
 c. Is the numeric information (e.g. dive depth) in metric or in imperial units?
 
-Armed with this information, importing the data into _Subsurface_ is
+With this information, importing the data into _Subsurface_ is
 straightforward. Select _Import -> Import Log Files_ from the main menu. In
 the resulting file selection menu, select _CSV files_ (towards the bottom
 right). This shows all .CSV files in the selected directory. Select the file
@@ -1166,37 +1111,36 @@ that needs to be imported. A configuration panel appears as depicted below:
 
 image::images/csv_import1_f20.jpg["FIGURE: CSV download dialogue 1", align="center"]
 
-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 _CSV_ file being imported
-originated from any of these pre-configured items, then select it. Otherwise
-use the _Manual Import_ 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 _CSV_ 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.
-
-The last remaining task is to ensure that all the data columns have the
-appropriate column headings. The top blue row of the data table contains the
-column headings found in the _CSV_ data file. The blue row of balloons
-immediately above these contains the names understood by _Subsurface_. These
-balloons can be moved using a drag-and-drop action. For instance,
-_Subsurface_ expects the column heading for Dive number (" # ") to be "Dive
-# ". If the column heading that _Subsurface_ expects is not in the blue row,
-then drag the appropriate balloon from the upper area and drop it in the
-appropriate blue cell at the top of the table. To indicate the correct
-column for "Dive #", drag the ballooned item labelled "Dive # " and drop it
-in the blue cell immediately above the white cell containing " # ". This is
-depicted in the image below.
+At the top left, there is a dropdown list containing pre- configured
+settings for common dive computers and software packages.
+ If the _CSV_ file being imported originated from any of
+these pre-configured items, select it. Otherwise use the _Manual Import_
+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 _CSV_ 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 data import.
+
+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 _CSV_ data file. The blue row of balloons immediately
+above these contains the names understood by _Subsurface_. These balloons
+can be moved using a drag-and-drop action. For instance, _Subsurface_
+expects the column heading for Dive number (" # ") to be "Dive # ". If the
+column heading that _Subsurface_ 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 cell
+immediately above the white cell containing " # ". This is depicted in the
+image below.
 
 image::images/csv_import2_f20.jpg["FIGURE: CSV download dialogue 2", align="center"]
 
-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 _OK_ button to the bottom
-right of the dialogue.  The data from the _CSV_ file are imported and shown
-in the *Dive List* panel.
+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 _OK_ button on the bottom right of the dialogue.
+The data from the _CSV_ file are imported and shown in the *Dive List*
+panel.
 
 [[S_CSV_Intro]]
 ****
@@ -1205,17 +1149,17 @@ in the *Dive List* panel.
 [IMPORTANT]
 
 _CSV_ is an abbreviation for a data file format: _Comma-Separated
-Values_. 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 _CSV_ format is that the
-data are easily editable as text without any proprietary software and
-ensuring all information is human-readable, not being obscured by any custom
-or proprietary attributes that proprietary software insert into files.
-Because of its simplicity the _CSV_ format is used as an interchange format
-between many software packages, e.g. between spreadsheet, statistical,
-graphics, database and diving software. Within _Subsurface_, _CSV_ files can
-also be used to import information from other sources such as
-spreadsheet-based dive logs and even from some dive computers.
+Values_. It is a 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 _CSV_ 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 _CSV_ format is used as an interchange format between many
+software packages, e.g. between spreadsheet, statistical, graphics, database
+and diving software. Within _Subsurface_, _CSV_ files can also be used to
+import information from other sources like spreadsheet-based dive logs and
+some dive computers.
 
 _CSV_ files can be created or edited with a normal text editor. The most
 important attribute of a _CSV_ file is the _field separator_, the character
@@ -1223,7 +1167,7 @@ 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 _CSV_ file. _CSV_ files are normally
-organised into a single line that provides the headers (or _field names_) of
+organized into a single line that provides the headers (or _field names_) 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
 _Dive site_, below. Here is an example of dive information for four dives
@@ -1267,21 +1211,21 @@ computer:
 
 When a _CSV_ file is selected for import, _Subsurface_ displays the column
 headers as well as some of the data in the first few lines of the _CSV_
-file, making it much easier to work with _CSV_ files.  _CSV_ files can
-therefore be used in many contexts for importing data into a _Subsurface_
-dive log.  Knowledge of a few basic things about the content of the _CSV_
-file allows a smooth import of the dives into _Subsurface_.
+file, making it much easier to work with _CSV_ files.  _CSV_ files can be
+used in many contexts for importing data into a _Subsurface_ dive log.
+Knowing a few basic things about the content of the _CSV_ file helps with a
+smooth import of the dives into _Subsurface_.
 
 ****
 
 
 [icon="images/icons/important.png"]
 [IMPORTANT]
-The _CSV_ import has a couple of caveats. One should avoid some special
-characters like ampersand (&), less than (<), greater than (>) and double
-quotes (") as part of the numbers or text within a cell. The file should use
-UTF-8 character set, if using non-ASCII characters. Also the size of the
-_CSV_ file might cause problems. Importing 100 dives at a time (_CSV dive
+But, the _CSV_ import has a couple of caveats. Avoid some special characters
+like ampersand (&), less than (<), greater than (>) and double quotes (") as
+part of the numbers or text within a cell. The file should use UTF-8
+character set, if using non-ASCII characters. Also the size of the _CSV_
+file might cause problems. Importing 100 dives at a time (_CSV dive
 details_) works, but larger files might exceed the limits of the parser
 used. When encountering problems with _CSV_ imports, first try with a
 smaller file to make sure everything works.
@@ -1293,18 +1237,16 @@ smaller file to make sure everything works.
 Using the *Subsurface Companion App* on an _Android device_   or
 xref:S_iphone[_iPhone_] with GPS, the coordinates
 for the diving
-location can be automatically passed to the _Subsurface_
-dive log. The Companion App stores the dive locations on
-a dedicated Internet file server. _Subsurface_, in turn, can collect
-the localities from the file server.
-
+location can be automatically passed to the _Subsurface_ dive log. The Companion App
+stores dive locations on a dedicated Internet server. _Subsurface_ can collect
+the locations from the server.
 To do this:
 
 ==== Create a Companion App account
 
 - Register on the http://api.hohndel.org/login/[_Subsurface companion web
   page_].  A confirmation email with instructions and a personal *DIVERID*
-  will be sent, a long number that gives access to the file server and
+  will be sent, a long number giving you access to the file server and
   Companion App capabilities.
 
 - Download the app from
@@ -1316,99 +1258,97 @@ To do this:
 
 On first use the app has three options:
 
-* _Create a new account._ Equivalent to registering in _Subsurface_ companion
-  page using an Internet browser. One can request a *DIVERID* using this
-  option, but this is supplied via email and followed up by interaction with
-  the http://api.hohndel.org/login/[_Subsurface companion web page_] in order
-  to activate the account.
+* _Create a new account._ Equivalent to registering in the _Subsurface_
+  companion page using an Internet browser. You can request a *DIVERID* using
+  this option, but it’s supplied via email and followed up by interaction with
+  the http://api.hohndel.org/login/[_Subsurface companion web page_] to
+  activate the account.
 
-* _Retrieve an account._ If users forgot their *DIVERID* they will receive an
+* _Retrieve an account._ If users forget their *DIVERID* they will receive an
   email to recover the number.
 
 * _Use an existing account._ Users are prompted for their *DIVERID*. The app
-  saves this *DIVERID* and does not ask for it again unless one uses the
+  saves this *DIVERID* and doesn’t ask for it again unless you use the
   _Disconnect_ menu option (see below).
 
 [icon="images/icons/important.png"]
 [IMPORTANT]
 In the _Subsurface_ main program, the *DIVERID* should also be entered on
-the Default Preferences panel, obtained by selecting _File -> Preferences ->
-Defaults_ from the main menu in _Subsurface_ itself.  This facilitates
-synchronisation between _Subsurface_ and the Companion App.
+the Default Preferences panel, by selecting _File -> Preferences ->
+Defaults_ from the main menu in _Subsurface_ itself.  This helps
+synchronization between _Subsurface_ and the Companion App.
 
 ===== Creating new dive locations
 
-Now one is ready to get a dive position and send it to the server. The
+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 (*A*) below, but without
 any dives.
 
-Touch the "+" icon on the top right to add a new dive site, a menu will be
-showed with 3 options:
+Touch the "+" icon on the top right to add a new dive site, a menu shows
+with 3 options:
 
 * Current: A prompt for a place name (or a request to activate the GPS if it
   is turned off) will be displayed, after which the current location is saved.
 
-* Use Map: This option allows the user to fix a position by searching a world
-  map. A world map is shown (see *B* below) on which one should indicate the
-  desired position with a _long press_ 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 *C* below). In
-  order to import this dive location in _Subsurface_ it's advisable to set the
-  time to agree with the time of that dive on the dive computer.
+* Use Map: This option lets you fix a position by searching a world map. A
+  world map is shown (see *B* below) on which you can show the desired
+  position with a _long press_ on the touch 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 *C* below). In
+  order to import this dive location in _Subsurface_ you should set the time
+  to agree with the time of that dive on the dive computer.
 
 image::images/Companion_5.jpg["FIGURE: Companion App, add location using map", align="center"]
 
 
 * Import local GPX file: The android device searches for .gpx files and
   located archives will be shown. The selected .gpx file is opened and the
-  stored locations shown. Now one needs to select the appropriate locations,
-  then select the tab in the upper right, after which the locations will be
-  sent to the web service and added to the list on the Android device.
+  stored 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.
 
 ===== Dive lists of dive locations
 
 The main screen shows a list of dive locations, each with a name, date and
 time (see *A* below). Some locations may have an arrow-up icon over the
-selection box to the left indicating that they require upload to the
-server. One can select individual dive locations from the list. A selected
+selection box to the left 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 _Delete_ or _Send_)  are performed on several locations that are
-selected.
+(like _Delete_ or _Send_)  are performed on several selected locations.
 
 Dive locations in this list can be viewed in two ways: a list of locations
-or a map indicating the dive locations. The display mode (List or Map) is
-changed by selecting _Dives_ at the top left of the screen (see *A* below)
-and then selecting the display mode. The display mode can be changed either
-from the list of locations or from the map (see *B* below). If one selects a
-location (on the list or on the map), an editing panel opens (see *C* below)
-where the dive description or other details may be changed.
+or a map showing them. The display mode (List or Map) is changed by
+selecting _Dives_ at the top left of the screen (see *A* below) and then
+selecting the display mode. The display mode can be changed either from the
+list of locations or from the map (see *B* below). If you select a location
+(on the list or on the map), an editing panel opens (see *C* below) where
+the dive description or other details may be changed.
 
 image::images/Companion_4.jpg["FIGURE: Companion App, add location using map", align="center"]
 
 
-When one selects a dive (*not* selecting the check box), the name given to
+When you select a dive (*not* 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:
 
 - Edit (pencil): Change the text name or other characteristics of the dive
   location.
 
-- Maps: Display a map showing the dive location.
-
-After editing and saving a dive location (see *C* above), one needs to
-upload it to the web service, as explained below.
+Maps: Display a map showing the dive location.  After editing and saving a
+dive location (see *C* above), upload it to the web service, as explained
+below.
 
 ===== Uploading dive locations
 
-There are several ways to send locations to the server.  The easiest is by
+There are several ways to send locations to the server.  The easiest is
 simply selecting the locations (See *A* below) and then touching the right
 arrow at the top right of the screen.
 
 [icon="images/icons/important.png"]
 [IMPORTANT]
-Users must be careful, as the trash icon on the right means exactly what it
-should; it deletes the selected dive location(s).
+Be careful! The trash icon on the right means exactly what it should; it
+deletes the selected dive location(s).
 
 image::images/Companion_1.jpg["FIGURE: Screen shots (A-B) of companion app", align="center"]
 
@@ -1427,24 +1367,22 @@ Selecting the _Settings_ menu option results in the right hand image above
 - _Web-service URL._ This is predefined (http://api.hohndel.org/)
 
 - _User ID._ 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.
-
+  easiest way to get it is to copy and paste from the confirmation email or
+  just type it in.
 ===== Synchronisation
 
 - _Synchronize on startup_. If selected, dive locations in the Android device
-  and those on the web service synchronise each time the app is started.
+  and those on the web service synchronize each time the app is started.
 
 - _Upload new dives._ If selected, each time the user adds a dive location it
   is automatically sent to the server.
 
 ===== Background service
-Instead of entering a unique dive location, users can leave the service
-running in the background of their Android device, allowing the continuous
+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.
 
-
-The settings below define the behaviour of the service:
+The settings below define the behavior of the service:
 
 - _Min duration._ In minutes. The app will try to get a location every X
   minutes until stopped by the user.
@@ -1455,14 +1393,14 @@ The settings below define the behaviour of the service:
 
 [icon="images/icons/info.jpg"]
 [TIP]
-_How does the background service work?_ Assuming the user sets 5 minutes and
-50 meters in the settings above, the app will start by recording a location
-at the current location, followed by another one at every 5 minutes *or*
-every time one moves 50 m from previous location.  If subsequent locations
-are within a radius of 50 meters from the previous one, a new location is
-not saved. If the user is not moving, only one location is saved, but if the
-user is moving, a trace of the route is obtained by saving a location every
-50 meters.
+_How does the background service work?_ 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
+*or* 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 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.
 
 ===== Other
 
@@ -1479,16 +1417,15 @@ Search the saved dive locations by name or by date and time.
 
 ===== Start service
 
-Initiates the _background service_ following the previously defined
-settings.
+Starts the _background service_ following the previously defined settings.
 
 ===== Disconnect
 
-This is a badly named option that disconnects the app from the server by
-resetting the user ID in the app, showing the first screen where an account
-can be created, retrieve the ID for an existing account or use the users own
-ID. The disconnect option is useful if a user's Android device was used to
-download the dive locations of another registered diver.
+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 your Android device was
+used to download the dive locations of another registered diver.
 
 ===== Send all locations
 
@@ -1497,27 +1434,27 @@ This option sends all locations stored in the Android device to the server.
 [[S_iphone]]
 ==== Using the Subsurface companion app on an _iPhone_ to record dive locations
 
-The iPhone interface is quite simple. One needs to type the user ID
-(obtained during registration) into the space reserved for it, then select
-"Dive in" (see left part of the image below) and start collecting dive
-location information.
+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.
 
 image::images/iphone.jpg["FIGURE: Using iPhone companion application", align="center", width=640]
 
 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 _iphone_ is automatic. When one
-adds a dive, the location service is started automatically and a red bar
-appears at the bottom of the screen. After the dive one can click on the red
-bar to end the location service. While the location service is running one
-can only add dives using the manual mechanism.
-
-One can edit the site name afterwards by selecting the dive from the dive
+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 _iphone_ 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, click on the red bar to end the
+location service. While the location service is running you can only add
+dives manually.
+
+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 trigger upload manually.
+dive list is automatically uploaded from the iPhone to the web
+service. There isn’t an option to trigger upload manually.
 
 
 ==== Downloading dive locations to the _Subsurface_ divelog
@@ -1527,49 +1464,49 @@ _Subsurface_ before obtaining the GPS coordinates from the server. The
 download dialog can be reached via _Ctrl+G_ or from the _Subsurface_ Main
 Menu _Import -> Import GPS data from Subsurface Service_, resulting in the
 image on the left (*A*), below. On first use the DIVERID text box is
-blank. Provide a DIVERID, then select the _Download_ button to initiate the
+blank. Provide a DIVERID, then select the _Download_ button to start the
 download process, after which the screen on the right (*B*) below appears:
 
 image::images/DownloadGPS.jpg["FIGURE: Downloading Companion app GPS data", align="center"]
 
-Note that the _Apply_ button is now active. By clicking on it, users can
-update the locations of the newly entered or uploaded dives in _Subsurface_
-which applies the coordinates and names entered on the app for all the new
-dives that match the date-times of the uploaded GPS localities. If one has
-entered the name of the dive location in _Subsurface_ before downloading the
-GPS coordinates, this name will take precedence over downloaded one.
+Note that the _Apply_ button is now active. By clicking on it, you can
+update the locations of the newly entered or uploaded dives in
+_Subsurface_. 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
+_Subsurface_ before downloading the GPS coordinates, this name will take
+precedence over downloaded one.
 
 Since _Subsurface_ 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 _Subsurface_ 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.
+assignment of GPS data to dives depends on agreeing date-time information
+between the two devices. Although _Subsurface_ has a wide range tolerance,
+it may not be able to identify the appropriate dive if there's a large
+difference between the time in the dive computer and that of the Android
+device.  That results in no updates.
 
 Similar date-times may not always be possible and there may be many reasons
-for this (e.g. time zones), or _Subsurface_ may be unable to decide which is
-the correct position for a dive (e.g. on repetitive dives while running
+for this (e.g. time zones).  _Subsurface_ may also be unable to decide which
+is the correct position for a dive (e.g. on repetitive dives while running
 _background service_ 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 _Subsurface_ Dive List *before* downloading
-the GPS data and then to change the date-time back again *after* downloading
-GPS data.
+subsequent dives as well).  A workaround to manually edit the date-time of a
+dive in the _Subsurface_ Dive List *before* downloading the GPS data and
+then to change the date-time back again *after* downloading GPS data.
 
 [icon="images/icons/info.jpg"]
 [NOTE]
 TIPS:
 
-- _Background service_, 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's route.  Currently these locations are difficult to
-  delete from the server. In some situations it is therefore prudent to clean
-  up the list on the Android device before sending the dive points to the web
-  server by simply deleting the inappropriate locations. This might be
-  necessary, for instance, if one wants to keep the location list clear to see
-  dives in the web service map display (see above).
-
+- _Background service_ may fill the location list with unnecessary locations
+  that don’t correspond to the exact dive point but do correspond to the
+  boat'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 you want to keep the
+  location list clear to see dives in the web service map display (see above).
 - It may also make sense to give informative names to the locations sent to
   the web server, or at least to use an informative name in the _Name
   Template_ setting while running the _background service_, especially on a
@@ -1579,11 +1516,11 @@ TIPS:
 === Adding photographs to dives
 
 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. _Subsurface_ allows one to load photos into a dive. Photos are
-superimposed on the dive profile, from where they can be viewed.
+during a dive. To match each photograph with a specific dive, _Subsurface_
+lets you load photos into a dive. Photos are superimposed on the dive
+profile, from where they can be viewed.
 
-==== Loading photos and getting synchronisation between dive computer and camera
+==== Loading photos and synchronizing between dive computer and camera
 
 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 _Load
@@ -1596,45 +1533,45 @@ to be loaded into _Subsurface_ and click the _Open_ button.
 
 image::images/LoadImage2_f20.jpg["FIGURE: Load images option", align="center"]
 
-This brings up the time synchronisation dialog, shown below. The critical
-problem is that the time synchronisation is not perfect between the dive
-computer used during a dive, and the camera used during that same
-dive. These two devices often differ by several minutes. If _Subsurface_ can
-achieve synchronisation, then the exact times of photographs can be used to
-position photographs on the dive profile.
+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 _Subsurface_ can synchronize, then the
+exact times of photographs can be used to position photographs on the dive
+profile.
 
-_Subsurface_ achieves this synchronisation in three ways:
+_Subsurface_ synchronizes in three ways:
 
-- *Pro-actively*: Before the dive, ensure synchronisation of the dive computer time settings with
+- *Pro-actively*: 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.
-- *Manually*: 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
+- *Manually*: 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 _Time shift_ dialog. Towards the top of the dialog is a time setting tool
-  immediately under the heading _Shift times of image(s) by_, evident in figure *A* below.
+  immediately under the heading _Shift times of image(s) by_, shown in figure *A* 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 _earlier_ or _later_ radio button.
   In the above example, the _earlier_ 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 _OK_ button and synchronisation is achieved.
+  in that tool. Click the _OK_ button and synchronization is done.
 
-image::images/LoadImage3b_f20.jpg["FIGURE: Synchronisation dialog", align="center"]
+image::images/LoadImage3b_f20.jpg["FIGURE: Synchronization dialog", align="center"]
 
 
-- *By photograph*: 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 _Subsurface_ can obtain
-  the exact time the photograph was taken, using the metadata that the camera stores within
-  each photo. In order to do this, use the bottom half of the _Time shift_ dialog. If one uses
+- *By photograph*: There is a very slick way of synchronizing. If you take a
+  photograph of the face of the dive computer showing the time, then _Subsurface_ 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 _Time shift_ dialog. If you use
   the bottom part, the top part of the dialog is ignored. Click on
-  the horizontal bar entitled "_Select image of dive computer showing time_. This brings up
-  a file browser with which one can select the photograph of the dive computer time. Select the
+  the horizontal bar called "_Select image of dive computer showing time_. 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 _OK_. This photograph of the dive computer
   appears in the bottom panel of the _Shift times_ dialog. Now _Subsurface_ 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, _Subsurface_ 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 *B* above shows a photograph of the face of the dive computer and with the date-time tool set to the
   date-time.
 
@@ -1647,9 +1584,9 @@ After the images have been loaded, they appear in two places:
 
  - the _Photos_ tab of the *Notes* panel.
  - 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 _show-photos_ button in the tool bar to
-   the left of the dive profile:
+   reflecting the time each photograph was taken.  To view the photos on the
+   dive profile, activate the _show-photos_ button in the tool bar to the left
+   of the dive profile:
 
 image::images/icons/ShowPhotos_f20.png["FIGURE:Show photos toolbar button", align="left"]
 
@@ -1657,18 +1594,17 @@ This results in a profile display as in the image below:
 
 image::images/LoadImage4_f20.jpg["FIGURE: Photos on dive profile", align="center"]
 
-If one hovers with the mouse over any of the photo icons, then a thumbnail
-photo is shown of the appropriate photo. See the image below:
+If you hover the mouse over any of the photo icons, a thumbnail photo is
+shown of the appropriate photo. See the image below:
 
 image::images/LoadImage5_f20.jpg["FIGURE:Thumbnail photo on dive profile", align="center"]
 
 Clicking on the thumbnail brings up a full size photo overlaid on the
-_Subsurface_ window. This allows good viewing of the photographs that have
-been added (see the image below). Note that the thumbnail has a small
-dustbin icon in the bottom right hand corner (see image above). If one
-selects the dustbin, the image is removed from the dive. Therefore some care
-is required when clicking on a thumbnail. Images can also be deleted using
-the _Photos_ tab (see text below).
+_Subsurface_ window. This allows good viewing of 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 _Photos_ tab (see text below).
 
 image::images/LoadImage6_f20.jpg["FIGURE: Full-screen photo on dive profile", align="center"]
 
@@ -1678,60 +1614,55 @@ Photographs associated with a dive are shown as thumbnails in the _Photos_
 tab of the _Notes_ panel. Photos taken in rapid succession during a dive
 (therefore sometimes with large overlap on the dive profile) can easily be
 accessed in the _Photos_ tab. This tab serves as a tool for individually
-accessing the photos of a dive, while the stubs on the dive profile give an
-indication of when during a dive a photo was taken. By single-clicking on a
-thumbnail in the _Photos_ panel, a photo is selected. By double-clicking a
-thumbnail, the full-sized image is shown, overlaying the _Subsurface_
-window. A photo can be deleted from the _Photos_ panel by selecting it
-(single-click) and then by pressing the _Del_ key on the keyboard. This
-removes the photo both from the _Photos_ tab as well as the dive profile.
+accessing the photos of a dive, while the stubs on the dive profile show
+when during a dive a photo was taken. By single-clicking on a thumbnail in
+the _Photos_ panel, a photo is selected. By double-clicking a thumbnail, the
+full-sized image is shown, overlaying the _Subsurface_ window. A photo can
+be deleted from the _Photos_ panel by selecting it (single-click) and then
+by pressing the _Del_ key on the keyboard. This removes the photo BOTH from
+the _Photos_ tab as well as the dive profile.
 
 ==== Photos on an external hard disk
-
-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 _Subsurface_. This facilitates the
-interaction between _Subsurface_ 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, _Subsurface_ cannot
-access these photos any more.  If the display of photos is activated (using
-the toolbox to the left of the _Dive Profile_), the program only shows a
-small white dot where each photo should be on the dive profile.  In addition
-the _Photos_ 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.
+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 _Subsurface_. This eases the interaction
+between _Subsurface_ and an external repository of photos. When associating
+a dive profile with photos from an external drive, the normal procedure of
+selection and synchronization (see text above) is used.  After the external
+drive has been disconnected, _Subsurface_ cannot access these photos any
+more.  If the display of photos is activated (using the toolbox to the left
+of the _Dive Profile_), the program only shows a small white dot where each
+photo should be on the dive profile.  In addition the _Photos_ 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.
 
 [[S_FindMovedImages]]
 ==== Moving photographs among directories, hard disks or computers
 
 After a photograph has been loaded into _Subsurface_ and associated with a specific dive, the directory
- where the photo lies is stored, allowing _Subsurface_ to find the photograph when the dive is
+ where the photo lies is stored, letting _Subsurface_ 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, _Subsurface_ 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, _Subsurface_ has a mechanism that eases the
  process of updating the directory information for each photo: automatic updates using fingerprints.
 
 When a photo is loaded into _Subsurface_, 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 _Subsurface_) to a different directory, disk or computer, _Subsurface_ can  perform the
- following steps:
-
-- look through a particular directory (and all its subdirectories recursively)
-  where photos have been moved
- to,
+ into _Subsurface_) to a different directory, disk or computer, _Subsurface_ can:
 
+look through a particular directory (and all its subdirectories recursively)
+where photos have been moved to,
 - calculate fingerprints for all photos in this directory, and
 
 - if there is a match between a calculated fingerprint and the one originally
   calculated when a photo was
- loaded into _Subsurface_ (even if the original file name has changed), to
+ loaded into _Subsurface_ (even if the original file name has changed),
  automatically update the directory information so that _Subsurface_ can find
  the photo in the new moved directory.
 
-This is achieved by selecting from the Main Menu: _File ->      Find moved images_. This brings up a window within
+This is done by selecting from the Main Menu: _File ->      Find moved images_. This brings up a window within
  which the NEW directory of the photos needs to be specified. Select the appropriate directory and click
  the _Scan_ button towards the bottom right of the panel. The process may require several minutes to
  complete, after which _Subsurface_ will show the appropriate photographs when a particular dive is opened.
@@ -1743,16 +1674,16 @@ This is achieved by selecting from the Main Menu: _File ->      Find moved image
 [icon="images/icons/important.png"]
 [IMPORTANT]
 
-_Subsurface_ automatically calculates fingerprints for all images that can
-be accessed by _Subsurface_.  When manipulating images, ensure that all the
-images associated with the dive log can be accessed by _Subsurface_.
+_Subsurface_ 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 _Subsurface_.
 
 _Subsurface_ 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 *Dive
   Profile*.
-- One edits anything in the *Notes tab* panel and save the edits by selecting
-  _Apply changes_.
+- If you edit anything in the *Notes tab* panel and save the edits by
+  selecting _Apply changes_.
 
 ****
 
@@ -1763,19 +1694,19 @@ fingerprints associated with a single dive if:
 ==== Multicylinder dives
 
 _Subsurface_ easily handles dives involving more than one
-cylinder. Multi-cylinder diving usually happens (a) if a diver does not have
-enough gas for the complete dive in a single cylinder; (b) if the diver
-needs more than one gas mixture because of the depth or the decompression
-needs of the dive. For this reason multi-cylinder dives are often used by
-technical divers who dive deep or long. As far as _Subsurface_ is concerned,
-there are only two types of information that need to be provided:
+cylinder. Multi-cylinder diving usually happens (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 _Subsurface_ is concerned, there are
+only two types of information that need to be provided:
 
 - *Describe the cylinders used during the dive* This is performed in the *Equipment tab* of
   the *Info* panel, as xref:cylinder_definitions[described above]. 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.
 
-- *Record the times at which switches from one cylinder to another was done:* This is information
-  provided by some dive computers (provided the diver indicated these changes to the dive computer
+- *Record the times at which the switch from one cylinder to another was done:* 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.
 
@@ -1787,9 +1718,9 @@ there are only two types of information that need to be provided:
   *tank bar* button in the toolbar has been activated, the cylinder switches are also indicated in the
   tank bar.
 
-Having performed these tasks, _Subsurface_ indicates the appropriate use of
+When this is complete, _Subsurface_ 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
+with EAN28, then changing cylinders to EAN50 after 26 minutes for
 decompression.
 
 image::images/multicylinder_dive.jpg["FIGURE: Multicylinder profile", align="center"]
@@ -1797,31 +1728,30 @@ image::images/multicylinder_dive.jpg["FIGURE: Multicylinder profile", align="cen
 ==== Sidemount dives
 
 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:
+both or all cylinders having 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:
 
 - *During the dive, record cylinder switch events*. Since sidemount diving normally involves two
-  cylinders with air or with the same gas mixture, _Subsurface_ distinguishes among these different
-  cylinders. In contrast, many dive computers that allow gas switching only distinguish among different
-  _gases_ used, not among different _cylinders_ 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, _Subsurface_ distinguishes between these different
+  cylinders. In contrast, many dive computers that allow gas switching only distinguish between different
+  _gases_ used, not among different _cylinders_ 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.
 - *Within _Subsurface_ describe the cylinders used during the dive*. The diver needs to provide the
   specifications of the different cylinders, using the *Equipment* tab of the *Info Panel* (see
   image below where two 12 litre cylinder were used).
 - *Indicate cylinder change events on the _Subsurface_ dive profile*. Once the dive log has been imported
-  from a dive computer into _Subsurface_, 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 _Subsurface_, 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 _Add gas change_. 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 *Tank Bar* 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.
 
@@ -1836,19 +1766,19 @@ logging tool.
 
 [icon="images/halcyon_RB80.jpg"]
 [NOTE]
-Passive semi-closed rebreathers (pSCR) comprise a technical advance in
-diving equipment that recirculates the breathing gas that a diver breathes,
-while removing carbon dioxide from the exhaled gas. While a small amount
-(typically a tenth) of the exhaled breathing gas is released into the water,
-a small amount of fresh gas is released from the back gas cylinder
-(typically containing nitrox).  A diver, using a single cylinder of
-breathing gas can therefore dive for much longer periods than using a
-recreational open-circuit configuration. With pSCR equipment, a very small
-amount of breathing gas is released every time the breather inhales. With
-active SCR (aSCR) equipment, in contrast, a small amount of breathing gas is
-released continuously from the back cylinder.
-
-To log pSCR dives, no special procedures are required, just the normal steps
+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 using a recreational
+open-circuit configuration. With pSCR equipment, a very small amount of
+breathing 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.
+
+To log pSCR dives, no special procedures are required. Use the normal steps
 outlined above:
 
 - Select pSCR in the _Dive Mode_ dropdown list on the *Info* panel.
@@ -1858,8 +1788,8 @@ outlined above:
   cylinder/gas changes as described above in the section on
   xref:S_MulticylinderDives[multicylinder dives].
 
-If a pSCR _Dive Mode_ has been selected, the dive ceiling for pSCR dives is
-adjusted for the oxygen drop across the mouthpiece which often requires
+If a pSCR _Dive Mode_ 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.
@@ -1874,9 +1804,9 @@ image::images/pSCR_profile.jpg["FIGURE: pSCR profile", align="center"]
 [icon="images/APD.jpg"]
 [NOTE]
 Closed system rebreathers use advanced technology to recirculate gas that
-has been breathed while doing two things to maintain a breathable oxygen
+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
 regulate the oxygen concentration to remain within safe diving limits.  The
 CCR interface of _Subsurface_ is currently experimental and under active
 development. Subsurface currently supports Poseidon MkVI and APD
@@ -1885,8 +1815,8 @@ recreational dive computer, a CCR system computer does not allow the
 download of a log containing multiple dives. Rather, each dive is stored
 independently. This means that _Subsurface_ cannot download a dive log
 directly from a CCR dive computer, but that it imports CCR dive logs in the
-same way that it imports dive log data from other digital databases: one
-dive at a time.
+same way it imports dive log data from other digital databases: one dive at
+a time.
 
 ===== Import a CCR dive
 
@@ -1896,14 +1826,14 @@ select _Import -> Import log files_ to bring up the
 xref:Unified_import[universal import dialogue]. As explained in that
 section, the bottom right hand of the import dialogue contains a dropdown
 list (labled _Filter:_) 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
+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 it is a file with a .txt extension). After selecting the
-appropriate dive log, activate the _Open_ button at the bottom right hand of
-the universal import dialogue.  The selected dive is imported to the
-_Subsurface_ dive list.
+the CCR dive 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, click the _Open_ button at the bottom right hand of the universal
+import dialogue.  The selected dive is imported to the _Subsurface_ dive
+list.
 
 ===== Displayed information for a CCR dive
 
@@ -1921,8 +1851,8 @@ follows:
 
 - 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.
+  sensors are treated as false. If one of the three sensors provides false
+  data, it is ignored.
 
 - If no sensor data are available, the pO~2~ value is assumed to be equal to
   the setpoint.
@@ -1931,20 +1861,20 @@ The mean pO~2~ of the sensors is indicated with a green line,
 
 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 _Preferences_ panel
+turned on by checking the appropriate boxes in the _Preferences_ panel
 (accessible by selecting xref:S_CCR_options[_File -> Preferences ->
 Graph_]). This part of the _Preferences_ panel is shown in the image below,
 representing two checkboxes that modify the display of pO~2~ when the
-appropriate toolbar button on the Dive Profile has been activated.
+appropriate toolbar button on the Dive Profile has been checked.
 
 image::images/CCR_preferences_f20.jpg["FIGURE: CCR preferences panel", align="center"]
 
-Checking any of these check boxes allows the display of additional
-oxygen-related information whenever the pO~2~ toolbar button on the
-_Profile_ panel is activated.  The first checkbox allows the display of
-setpoint information. This is a red line superimposed on the green oxygen
-partial pressure graph and allows a comparison of the mean measured oxygen
-partial pressure and the setpoint values, as shown below.
+Checking any of these boxes allows the display of additional oxygen-related
+information whenever the pO~2~ toolbar button on the _Profile_ panel is
+activated.  The first checkbox allows the display of setpoint
+information. This is a red line superimposed on the green oxygen partial
+pressure graph and allows a comparison of the mean measured oxygen partial
+pressure and the setpoint values, as shown below.
 
 image::images/CCR_setpoint_f20.jpg["FIGURE: CCR setpoint and po2 graph", align="center"]
 
@@ -1977,8 +1907,8 @@ two cylinders are shown as green lines overlapping the depth profile. In
 addition, start and end pressures for both oxygen and diluent cylinders are
 shown in the _Equipment Tab_.  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.
+cylinder pressure data. In this case there is agreement from the readings of
+the two oxygen sensors.
 
 image::images/CCR_dive_profile_f22.jpg["FIGURE: CCR dive profile", align="center"]
 
@@ -1996,9 +1926,9 @@ dive profile:
 
 image::images/icons/cceiling.jpg["DC ceiling icon"]
 
-The default colour of the computer-generated deco ceiling is white. However,
-this can be set to red by checking the appropriate check box after selecting
-_File -> Preferences -> Graph_.  Below is a dive profile indicating the dive
+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 _File ->
+Preferences -> Graph_.  Below is a dive profile indicating the dive
 computer-generated deco ceiling:
 
 image::images/CCR_dive_ceilingF22.jpg["FIGURE: CCR computer-generated deco ceiling", align="center"]
@@ -2043,8 +1973,8 @@ image::images/ExtraDataTab_f20.jpg["FIGURE: Extra Data tab", align="center"]
 The Stats tab gives summary statistics for more than one dive, assuming that
 more than one dive has been selected in the *Dive List* using the standard
 Ctrl-click or Shift-click of the mouse. If only one dive has been selected,
-figures pertaining to only that dive are given. This tab shows the number of
-dives selected, the total amount of dive time in these dives, as well as the
+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, water temperature and
 surface air consumption (SAC). It also shows the depth of the shallowest and
 deepest dives of those selected.
@@ -2056,23 +1986,23 @@ image::images/Profile2.jpg["Typical dive profile", align="center"]
 
 Of all the panels in _Subsurface_, the Dive Profile contains the most
 detailed information about each dive. The Dive Profile has a *button bar* on
-the left hand side that allows control over several display options. The
+the left hand side 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 speed of going up or down in the water
-column. This information is given using different colours:
+Profile is the graph of 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 colors:
 |====================
-|*Couleur*|*Vitesse de descente (m/min)*|*Vitesse de remontée (m/min)*
-|Rouge|> 30|> 18
+|*Color*|*Descent speed (m/min)*|*Ascent speed (m/min)*
+|Red|> 30|> 18
 |Orange|18 - 30|9 - 18
-|Jaune|9 - 18|4 - 9
-|Vert clair|1.5 - 9|1.5 - 4
-|Vert foncé|< 1.5|< 1.5
+|Yellow|9 - 18|4 - 9
+|Light green|1.5 - 9|1.5 - 4
+|Dark green|< 1.5|< 1.5
 |=====================
 
 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
+graph.  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.
 
@@ -2080,8 +2010,8 @@ to a particular moment during the dive.
 [NOTE]
 In some cases the dive profile does not fill the whole area of the *Dive
 Profile* panel. Clicking the *Scale* 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.
+the dive profile increases the size of the dive profile to fill the area of
+the panel.
 
 *Water temperature* is displayed with its own blue line with temperature values
 placed adjacent to significant changes.
@@ -2090,13 +2020,13 @@ The dive profile can include graphs of the *partial pressures* of O~2~,
 N~2~, and He during the dive (see figure above) as well as a calculated and
 dive computer reported deco ceilings (only visible for deep, long, or
 repetitive dives).  Partial pressures of oxygen are indicated in green,
-those of nitrogen in black, and those of helium in dark red. These partial
-pressure graphs are shown below the profile data.
+nitrogen in black, and helium in dark red. These partial pressure graphs are
+shown below the profile data.
 
 [icon="images/icons/O2.jpg"]
 [NOTE]
 Clicking this button allows display of the partial pressure of *oxygen*
-during the dive. This is depicted below the dive depth and water temperature
+during the dive. This is shown below the dive depth and water temperature
 graphs.
 
 [icon="images/icons/N2.jpg"]
@@ -2107,16 +2037,16 @@ during the dive.
 [icon="images/icons/He.jpg"]
 [NOTE]
 Clicking this button allows display of the partial pressure of *helium*
-during the dive.  This is only of importance to divers using Trimix,
-Helitrox or similar breathing gasses.
+during the dive.  This is only important to divers using Trimix, Helitrox or
+similar breathing gasses.
 
 The *air consumption* graph displays the tank pressure and its change during
 the dive. The air consumption takes depth into account so that even when
-manually entering the start and end pressures the graph is not a straight
-line.  Similarly to the depth graph the slope of the tank pressure gives the
-user information about the momentary SAC rate (Surface Air Consumption) when
-using an air integrated dive computer.  Here the colour coding is not
-relative to some absolute values but relative to the average normalised air
+manually 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 color coding is not
+relative to some absolute values but relative to the average 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.
@@ -2131,53 +2061,50 @@ It is possible to *zoom* into the profile graph. This is done either by using
 the scroll wheel / scroll gesture of your mouse or trackpad. By default
 _Subsurface_ 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.
-
+ (100ft) – this way short or shallow dives are easily recognizable;
+something free divers won’t care about.
 image::images/MeasuringBar.png["FIGURE: Measuring Bar", align="center"]
 
 [icon="images/icons/ruler.jpg"]
 [NOTE]
 Measurements of *depth or time differences* can be achieved by using the
 *ruler button* on the left of the dive profile panel.  The measurement is
-done by dragging the red dots to the two points on the dive profile that the
-user wishes to measure. Information is then given in the horizontal white
-area underneath the two red dots.
+done by dragging the red dots to the two points on the dive profile that you
+wish to measure. Information is then given in the horizontal white area
+underneath the two red dots.
 
 [icon="images/icons/ShowPhotos.png"]
 [NOTE]
 Photographs that have been added to a dive can be shown on the profile by
 selecting the *Show-photo* button. The position of a photo on the profile
-indicates the exact time when this photo was taken. If this button is not
+shows the exact time when this photo was taken. If this button is not
 active, the photos are hidden.
 
 
 The profile can also include the dive computer reported *ceiling* (more
 precisely, the deepest deco stop that the dive computer calculated for each
 particular moment in time) as a red overlay on the dive profile. Ascent
-ceilings arise when a direct ascent to the surface increases the risk of a
+ceilings 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 available to divelog software. _Subsurface_ 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
-_Subsurface_ are the same, even if the same algorithm and _gradient factors_
-(see below) are used.  It is also quite common that _Subsurface_ calculates
-a ceiling for non-decompression dives when the dive computer stayed in
-non-deco mode during the whole dive (represented by the [green]#dark green#
-section in the profile at the beginning of this section). This is caused by
-the fact that _Subsurface’s_ calculations describe the deco obligation at
-each moment during a dive, while dive computers usually take the upcoming
-ascent into account. During the ascent some excess nitrogen (and possibly
-helium) are already breathed off so even though the diver technically
-encountered a ceiling at depth, the dive still does not require an explicit
-deco stop. This feature allows dive computers to offer longer non-stop
-bottom times.
+available for download; for example none of the Suunto dive computers make
+these data available to divelog software. _Subsurface_ 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’s unlikely that ceilings from dive computers and from _Subsurface_ are
+the same, even if the same algorithm and _gradient factors_ (see below) are
+used.  It’s also quite common that _Subsurface_ calculates a ceiling for
+non-decompression dives when the dive computer stayed in non-deco mode
+during the whole dive (represented by the [green]#dark green# section in the
+profile at the beginning of this section). This is because _Subsurface’s_
+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 a specific deco stop. This feature lets dive
+computers offer longer non-stop bottom times.
 
 [icon="images/icons/cceiling.jpg"]
 [NOTE]
@@ -2208,12 +2135,11 @@ image::images/Ceilings2.jpg["Figure: Ceiling with 3m resolution", align="center"
 [icon="images/icons/ShowCylindersButton.jpg"]
 [NOTE]
 By selecting this icon, the different cylinders used during a dive can be
-represented as a coloured bar at the bottom of the *Dive Profile*. In
-general oxygen is represented by a green bar, nitrogen with a yellow bar and
-helium with a red bar. The image below shows a dive which first uses a
-trimix cylinder (red and green), followed by a switch to a nitrox cylinder
-(yellow and green) after 23 minutes. Cylinders with air are shown as a light
-blue bar.
+represented as a colored bar at the bottom of the *Dive Profile*. 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.
 
 image::images/ShowCylinders_f20.jpg["Figure: Cylinder use graph", align="center"]
 
@@ -2227,14 +2153,13 @@ ZH-L16 algorithm and are displayed as lines ranging from green (faster
 tissues) to blue (slower tissues).  The black line, graphed above the
 ambient pressure, is the maximum allowable tissue supersaturation (pressure
 limit) derived from the gradient factors specified in the *Preferences*. For
-divers involved in planned decompression diving, efficient rates of
-offgasing are obtained with tissue pressures between the ambient inert gas
-pressure (grey line) and the pressure limit (black line). This display is a
-representation of the tissue pressures during the whole dive. In contrast,
-the xref:S_gas_pressure_graph[Gas Pressure Graph] in the *Information Box*
-on the *Dive Profile* is an instantaneous reflection of tissue pressures at
-the moment in time reflected by the position of the cursor on the dive
-profile.
+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
+xref:S_gas_pressure_graph[Gas Pressure Graph] in the *Information Box* on
+the *Dive Profile* is an instantaneous reflection of tissue pressures at the
+moment in time, at the position of the cursor on the dive profile.
 
 image::images/tissuesGraph.jpg["Figure: Inert gas tissue pressure graph", align="center"]
 
@@ -2255,27 +2180,26 @@ dive. For more information external to this manual see:
 === The Dive Profile context menu
 
 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 *Equipment* Tab. Set-point
-change events open a dialog allowing to choose the next set-point value. As
-in the planner, a set-point value of zero indicates the diver is breathing
-from an open circuit system while any non-zero value indicates the use of a
-closed circuit rebreather (CCR).  By right-clicking while over an existing
-marker a menu appears, adding options to allow deletion of the marker or to
-allow all markers of that type to be hidden. Hidden events can be restored
-to view by selecting Unhide all events from the context menu.
+the 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 *Equipment* 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 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 restored to view by selecting Unhide all events
+from the context menu.
 
 [[S_InfoBox]]
 === The *Information Box*
-
-The Information box displays a large range of information pertaining to the
-dive profile. Normally the Information Box is located to the top left of the
+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
 *Dive Profile* panel. If the mouse points outside of the *Dive Profile*
 panel, then only the top line of the Information Box is visible (see
 left-hand part of figure (*A*) below). The Information Box can be moved
@@ -2285,25 +2209,24 @@ Box is saved and used again during subsequent dive analyses.
 
 image::images/InfoBox2.jpg["Figure: Information Box", align="center"]
 
-The moment the mouse points inside the *Dive Profile* 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 (*B*) above where the Information Box reflects the
-situation at the position of the cursor [arrow] in that image). Therefore,
-moving the cursor in the horizontal direction allows the Information Box to
-show information for any point along the dive profile.  In this mode, the
-Information Box gives extensive statistics about depth, gas and ceiling
-characteristics of the particular dive. These include: Time period into the
-dive (indicated by a @), depth, cylinder pressure (P), temperature,
-ascent/descent rate, surface air consumption (SAC), oxygen partial pressure,
-maximum operating depth, equivalent air depth (EAD), equivalent narcotic
-depth (END), equivalent air density depth (EADD), decompression requirements
-at that instant in time (Deco), time to surface (TTS), the calculated
-ceiling, as well as the calculated ceiling for several Bühlmann tissue
-compartments.
-
-The user has control over the display of several statistics, represented as
-four buttons on the left of the profile panel. These are:
+When the mouse points inside the *Dive Profile* panel, the information box
+expands and shows many data items. In this situation, the data reflect the
+time point along the dive profile shown by the mouse cursor (see right-hand
+part of figure (*B*) above where the Information Box reflects the situation
+at the position of the cursor [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 into the dive (indicated by a @), depth,
+cylinder pressure (P), temperature, ascent/descent rate, surface air
+consumption (SAC), oxygen partial pressure, maximum operating depth,
+equivalent air depth (EAD), equivalent narcotic depth (END), equivalent air
+density depth (EADD), decompression requirements at that instant in time
+(Deco), time to surface (TTS), the calculated ceiling, as well as the
+calculated ceiling for several Bühlmann tissue compartments.
+
+The user has control over the display of some statistics, shown as four
+buttons on the left of the profile panel. These are:
 
 [icon="images/icons/MOD.jpg"]
 [NOTE]
@@ -2313,7 +2236,7 @@ dependent on the oxygen concentration in the breathing gas.  For air (21%
 oxygen) it is around 57 m if a maximum pO~2~ of 1.4 is specified in the
 *Preferences* section (select _File_ -> Preferences -> Graph_ and edit the
 text box _Max pO~2~ when showing MOD_.  Below the MOD there is a markedly
-increased risk of exposure to the dangers associated with oxygen toxicity.
+increased risk of exposure to the dangers of oxygen toxicity.
 
 [icon="images/icons/NDL.jpg"]
 [NOTE]
@@ -2321,40 +2244,39 @@ Clicking this button causes the Information Box to display either the
 *No-deco Limit (NDL)* or the *Total Time to Surface (TTS)*. 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 _TTS > 2h_.
+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. 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 _TTS > 2h_.
 
 [icon="images/icons/SAC.jpg"]
 [NOTE]
 Clicking this button causes the Information Box to display the *Surface Air
-Consumption (SAC)*.  SAC is an indication of the surface-normalised
+Consumption (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.
+of breathing gas consumption rate 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.
 
 [icon="images/icons/EAD.jpg"]
 [NOTE]
 Clicking this button displays the *Equivalent Air Depth (EAD)* for nitrox
 dives as well as the *Equivalent Narcotic Depth (END)* for trimix
-dives. These are numbers of importance to divers who use breathing gases
-other than air. Their values are dependent on the composition of the
-breathing gas.  The EAD is the depth of a hypothetical air dive that has the
-same partial pressure of nitrogen as the current depth of the nitrox dive at
-hand. A nitrox dive leads to the same decompression obligation as an air
-dive to the depth equalling the EAD. The END is the depth of a hypothetical
-air dive that has the same sum of partial pressures of the narcotic gases
-nitrogen and oxygen as the current trimix dive. A trimix diver can expect
-the same narcotic effect as a diver breathing air diving at a depth
-equalling the END.
+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 hand. A nitrox dive
+leads to the same decompression obligation as an air dive to the depth
+equalling the EAD. The END is the depth of a hypothetical air dive that has
+the same sum of partial pressures of the narcotic gases nitrogen and oxygen
+as the current trimix dive. A trimix diver can expect the same narcotic
+effect as a diver breathing air diving at a depth equalling the END.
 
 Figure (*B*) above shows an information box with a nearly complete set of
 data.
@@ -2362,17 +2284,17 @@ data.
 [[S_gas_pressure_graph]]
 ==== The Gas Pressure Bar Graph
 
-On the left of the *Information Box* is a vertical bar graph indicating the
+On the left of the *Information Box* 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 _at a particular instant during the
-dive_, indicated by the position of the cursor on the *Dive Profile*. The
+dive_. It is shown by the position of the cursor on the *Dive Profile*. The
 drawing on the left below indicates the meaning of the different parts of
 the Gas Pressure Bar Graph.
 
 image::images/GasPressureBarGraph.jpg["FIGURE:Gas Pressure bar Graph", align="center"]
 
 - 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
+  light green 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 _relative_ value in the graph and does not
   indicate absolute pressure.
@@ -2395,20 +2317,20 @@ image::images/GasPressureBarGraph.jpg["FIGURE:Gas Pressure bar Graph", align="ce
   *Subsurface*.
 
 - 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
+  M-value. That is the pressure value of inert gases at which bubble formation
   is expected to be severe, resulting in decompression sickness.
 
-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.
+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.
 
-- Graph *A* indicates the situation at the start of a dive with diver at the
-  surface. The pressures in all the tissue compartments are still at the
-  equilibrium pressure because no diving has taken place.
+- Graph *A* 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.
 
 - Graph *B* 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.
+  tissue compartments have had time to respond to the descent, so their gas
+  pressures are far below the equilibrium gas pressure.
 
 - Graph *C* represents the pressures after 30 minutes at 30 m. The fast
   compartments have attained equilibrium (i.e. they have reached the hight of
@@ -2416,11 +2338,11 @@ side of the above figure for a diver using EAN32.
   (towards the right) have not reached equilibrium and are in the process of
   slowly increasing in pressure.
 
-- Graph *D* 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
+- Graph *D* shows the pressures after ascent to a depth of 4.5 meters. Since
+  during ascent the total inhaled gas pressure has decreased strongly from 4
   bar to 1.45 bar, the pressures in the different tissue compartments now
-  exceed that of the total gas pressure and approaches the gradient factor
-  value (i.e.  the top black horizontal line). Further ascent will result in
+  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.
 
 - Graph *E* indicates the situation after remaining at 4.5 meters for 10
@@ -2431,19 +2353,19 @@ side of the above figure for a diver using EAN32.
 
 
 
-== Organising the logbook (Manipulating groups of dives)
+== Organizing the logbook (Manipulating groups of dives)
 
 === The Dive List context menu
 
-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.
+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.
 
 image::images/ContextMenu.jpg["Figure: Context Menu", align="center"]
 
-The context menu is used in many manipulations described below.
+The context menu is used in many functions described below.
 
-==== Customising the columns showed in the *Dive List* panel
+==== Customizing the columns showed in the *Dive List* panel
 
 image::images/DiveListOptions.jpg["Example: Dive list info options", align="center"]
 
@@ -2452,8 +2374,8 @@ 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 *Dive List*. For instance, a right-click on the 'Date' 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 *Dive List* or to be deleted from
-the dive list (reflected by the check symbols) and the list is immediately
+above). Select an item to be shown in the *Dive List* or be deleted
+(reflected by the check symbols) and the list is immediately
 updated. Preferences for information shown in the *Dive List* are saved and
 used when _Subsurface_ is re-opened.
 
@@ -2461,64 +2383,60 @@ used when _Subsurface_ is re-opened.
 === Renumbering the dives
 
 Dives are normally numbered incrementally from non-recent dives (low
-sequence numbers) to recent dives (having the highest sequence numbers). The
-numbering of the dives is not always consistent. For instance, when
-non-recent dives are added to the dive list the numbering does not
-automatically follow on because of the dives that are more recent in
-date/time than the newly-added dive with an older date/time. Therefore, one
-may sometimes need to renumber the dives.  This is performed by selecting
-(from the Main Menu) _Log -> Renumber_. Users are given a choice with
-respect to the lowest sequence number to be used.  Completing this operation
-results in new sequence numbers (based on date/time)  for the dives in the
-*Dive List* panel.
-
-One can also renumber a few selected dives in the dive list. Select the
+sequence 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. So you may need to renumber the dives.  Do this by
+selecting (from the Main Menu) _Log -> Renumber_. 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 *Dive List* panel.
+
+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.
+letting the user specify the starting number for the process.
 
 [[S_Group]]
 === Grouping dives into trips and manipulating trips
 
 For regular divers, the dive list can rapidly become very long. _Subsurface_
-can group dives into _trips_. It performs this by grouping dives that have
-date/times not separated in time by more than two days, thus creating a
-single heading for each diving trip represented in the dive log. Below is an
+can group dives into _trips_. 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 (*A*, on the left) as well as the corresponding grouped
-dive list comprising five dive trips (*B*, on the right):
+dive list of five dive trips (*B*, on the right):
 
 image::images/Group2.jpg["Figure: Grouping dives", align="center"]
 
 Grouping into trips allows a rapid way of accessing individual dives without
-having to scan a long lists of dives. In order to group the dives in a dive
-list, (from the Main Menu) select _Log -> Autogroup_. The *Dive List* panel
-now shows only the titles for the trips.
+having to scan a long lists of dives. To group the dives in a dive list,
+(from the Main Menu) select _Log -> Autogroup_. The *Dive List* panel now
+shows only the titles for the trips.
 
 ==== Editing the title and associated information for a particular trip
 
 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 *Dive List*. This shows a *Trip Notes* tab in the *Notes*
-panel. Here one can add or edit information about the date/time, the trip
+panel. Here 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 dived with, the general weather and surface conditions
+dive company that was used, the general weather and surface conditions
 during the trip, etc.).  After entering this information, select *Save* from
 the buttons at the top right of the *Trip Notes* tab. The trip title in the
 *Dive List* panel should now reflect the edited information.
 
 ==== Viewing the dives during a particular trip
 
-Once the dives have been grouped into trips, users can expand one or more
+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.
+expands the selected trip, revealing individual dives done during the trip.
 
 ==== Collapsing or expanding dive information for different trips
 
 After selecting a particular trip in the dive list, the context menu allows
-several possibilities to expand or collapse dives within trips. This
-includes expanding all trips and collapsing all trips.
+several options to expand or collapse dives within trips. This includes
+expanding all trips and collapsing all trips.
 
 ==== Merging dives from more than one trip into a single trip
 
@@ -2527,14 +2445,12 @@ by either merging the selected trip with the trip below or with the trip
 above. (Merge trip with trip below; Merge trip with trip above)
 
 ==== Splitting a single trip into more than one trip
-
-If a trip includes ten dives, the user can split this trip into two trips
-(trip 1: top 4 dives; trip 2: bottom 6 dives) by selecting and
-right-clicking the top four dives. The resulting context menu allows the
-user to create a new trip by choosing the option *Create new trip
-above*. The top four dives are then grouped into a separate trip. The
-figures below shows the selection and context menu on the left (A) and the
-completed action on the right (B):
+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 lets the user create a new trip
+by choosing the option *Create new trip above*. The top four dives are then
+grouped 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):
 
 image::images/SplitDive3a.jpg["FIGURE: Split a trip into 2 trips", align="center"]
 
@@ -2543,18 +2459,18 @@ image::images/SplitDive3a.jpg["FIGURE: Split a trip into 2 trips", align="center
 ==== Delete a dive from the dive log
 
 Dives can be permanently deleted from the dive log by selecting and
-right-clicking them to bring up the context menu, and then selecting *Delete
+right-clicking them to bring up the context menu, then selecting *Delete
 dive(s)*. 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.
 
 ==== Unlink a dive from a trip
 
-Users can unlink dives from the trip to which they belong. In order to do
-this, select and right-click the relevant dives to bring up the context
-menu. Then select the option *Remove dive(s)  from trip*. The dive(s) now
-appear immediately above or below the trip to which they belonged, depending
-on the date and time of the unlinked dive.
+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 *Remove dive(s)  from trip*. The dive(s) now appear immediately
+above or below the trip to which they belonged, depending on the date and
+time of the unlinked dive.
 
 ==== Add a dive to the trip immediately above
 
@@ -2563,22 +2479,20 @@ within a separate trip. To do this, select and right-click the dive(s) to
 bring up the context menu, and then select *Create new trip above*.
 
 ==== Shift the start time of dive(s)
-
-Sometimes it is necessary to adjust the start time of a dive. This may apply
-to situations where dives are performed in different time zones or when the
-dive computer has an erroneous time. In order to do this, select and
-right-click the dive(s) to be adjusted. This action brings up the context
-menu on which the *Shift times* option should be selected. User must then
-specify the time (in hours and minutes) by which the dives should be
-adjusted and click on the option indicating whether the time adjustment
-should be ealier or later.
+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 brings up the context menu on which the *Shift times*
+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 of
+whether the time adjustment should be earlier or later.
 
 ==== Merge dives into a single dive
 
-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 *Dive List*
-panel. Users can merge these dives onto a single dive by selecting the
+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 *Dive
+List* 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 *Merge selected dives*. It may be necessary to edit the dive
 information in the *Notes* panel to reflect events or conditions that apply
@@ -2599,45 +2513,45 @@ _Redo_ an action.
 [[S_Filter]]
 === Filtering the dive list
 
-The dives in the *Dive List* panel can be filtered, that is, one can select
-only some of the dives based on their attributes, e.g. dive tags, dive site,
-dive master, buddy or protective clothing. For instance, filtering allows
-one to list the deep dives at a particular dive site, or otherwise the cave
-dives with a particular buddy.
+The dives in the *Dive List* 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 lets you list
+the deep dives at a particular dive site, or otherwise the cave dives with a
+particular buddy.
 
 To open the filter, select _Log -> Filter divelist_ from the main menu. This
 opens the _Filter Panel_ at the top of the _Subsurface_ window. Three icons
 are located at the top right hand of the filter panel (see image below). The
 _Filter Panel_ can be reset (i.e. all current filters cleared) by selecting
-the *yellow angled arrow*. The _Filter Panel_ may also be minimised by
-selecting the *green up-arrow". When minimised, only these three icons are
-shown.  The panel can be maximised by clicking the icon that minimised the
-panel. The filter may also be reset and closed by selecting the *red button*
+the *yellow angled arrow*. The _Filter Panel_ may also be minimized by
+selecting the *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*
 with the white cross.
 
 image::images/Filterpanel.jpg["Figure: Filter panel", align="center"]
 
 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
+(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 of the attributes within that
-check list. For instance, typing "_ca_" in the filter textbox above the tags
-check list results in the tags check list being reduced to "_cave_" and
-"_cavern_". Filtering of the check list enables the rapid finding of search
-terms for filtering the dive list.
+filter tool, allowing the listing of only some attributes within that check
+list. For instance, typing "_ca_" in the filter text box above the tags
+check list, results in the list being reduced to "_cave_" and
+"_cavern_". Filtering the check list helps to rapidly find search terms for
+filtering the dive list.
 
 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 _AND_ operators, Subsurface filters
-therefore for _cave_ as a tag AND _Joe Smith_ as a buddy; but the filters
+check lists work as a filter with _AND_ operators. Subsurface filters
+therefore for _cave_ as a tag AND _Joe Smith_ as a buddy. But the filters
 within a category are inclusive - filtering for _cave_ and _boat_ shows
 those dives that have either one OR both of these tags.
 
 [[S_ExportLog]]
 == Exporting the dive log or parts of the dive log
 
-There are two routes for the export of dive information from Subsurface:
+There are two ways to export dive information from Subsurface:
 
 - Exporter les informations de plongée vers _Facebook_
 
@@ -2647,45 +2561,41 @@ There are two routes for the export of dive information from Subsurface:
 [[S_facebook]]
 === Export des informations de plongée vers _Facebook_
 
-L'export des plongées vers _Facebook_ est géré différemment des autres types
-d'export car une connexion vers _Facebook_ est nécessaire, nécessitant un
-identifiant et un mot de passe. À partir du menu principal, si vous
-sélectionnez _Fichier -> Préférences -> Facebook_, un écran de connexion est
-présenté (image *A* sur la gauche, ci dessous). Entrez l'identifiant et le
-mot de passe _Facebook_. Une fois connecté à _Facebook_, le panneau de
-l'image *B* ci dessous est présenté, avec un bouton _Déconnecter de
-Facebook_ pour fermer la connexion _Facebook_.
+Export of dives to _Facebook_ is handled differently from other types of
+export because a connection to _Facebook_ is required, needing a _Facebook_
+userID and password.  If, from the *Main Menu*, you select _File ->
+Preferences -> Facebook_, a login screen comes up.  (image *A* to the left,
+below).  Provide a _Facebook_ userID and password.  Once logged into to
+_Facebook_ , the panel in image *B*, below is shown, including a _Disconnect
+from Facebook_ button to close the _Facebook_ connection.
 
 image::images/facebook1_f20.jpg["Figure: Facebook login", align="center"]
 
-From the _Subsurface_ window it is easy to determine whether _Subsurface_
-has a valid connection to _Facebook_ From the *Main Menu*, select _Share on
--> Facebook_ (image *A*, below). Normally, the _Facebook_ option is greyed
+From the _Subsurface_ window it’s easy to determine whether _Subsurface_ has
+a valid connection to _Facebook_ From the *Main Menu*, select _Share on ->
+Facebook_ (image *A*, below). Normally, the _Facebook_ option is greyed
 out. But if there is a connection to _Facebook_, this option is active
-(i.e. in black colour and can be selected).
-
-Une fois qu'une connexion à _Facebook_ est établie, transférer un profil de
-plongée vers _Facebook_ est facile. Assurez-vous que la plongée à transférer
-est affichée dans le panneau *Profil de plongée* de _Subsurface_. Si, à
-partir du *menu principal*, vous sélectionnez _Partager sur -> Facebook_,
-une fenêtre s'affiche, pour déterminer quelles informations seront
-transférées avec le profil de plongée (voir l'image *B* ci-dessous). Pour
-transférer un profil de plongée vers _Facebook_, le nom d'un album
-_Facebook_ doit être fourni. Les cases à cocher sur la partie gauche
-permettent de sélectionner des informations supplémentaires à transférer
-avec le profil de plongée. Ces informations sont affichées dans le champs de
-texte sur la partie droite du panneau. (image *B* ci dessous). Vous pouvez
-facilement modifier le message qui sera envoyé avec le profil de
-plongée. Une fois les informations supplémentaires ajoutées et vérifiées,
-sélectionner le bouton _OK_ qui lance le transfert vers _Facebook_. Après un
-moment, une fenêtre apparait indiquant le succès du transfert.
-
-À la fois l'album créé et la publication sur votre ligne temporelle seront
-marquées comme privés. Pour que vos amis puissent voir la publication,
-modifier les permissions à partir d'une connexion Facebook standard depuis
-un navigateur ou l'application Facebook. Malgré que cela soit une étape
-supplémentaire, c'est la meilleure solution pour éviter d'avoir des
-publications non désirées sur votre ligne temporelle publique.
+(i.e. in black color and can be selected).
+
+Having established a login to _Facebook_, transferring a dive profileto a
+_Facebook_ timeline is easy.  Be sure the dive to be transferred to the
+timeline is shown in the _Subsurface_ *Dive Profile* panel. If, from the
+*Main Menu*, you select _Share on -> Facebook_ (see image *A* below), a
+dialogue box is shown, determining the amount of additional information
+transferred along with the dive profile (image *B*, below). To transfer a
+dive profile to _Facebook_, the name of a _Facebook_ 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 *B*,
+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 _OK_ button that triggers the transfer to _Facebook_. After
+the transfer is done, an acknowledgement dialogue appears, indicating it was
+successful.
+
+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.
 
 image::images/facebook2_f20.jpg["Figure: Facebook login", align="center"]
 
@@ -2695,8 +2605,8 @@ principal et en cliquant sur le bouton approprié dans le panneau des
 préférences Facebook.
 
 [[S_Export_other]]
-=== Export dive information  to other destinations or formats
-For non-_Facebook exports_, the export function can be reached by selecting
+=== Export dive information to other destinations or formats
+For non-_Facebook exports_, the export function can be found by selecting
 _File -> Export_, which brings up the Export dialog. This dialog always
 gives two options: save ALL dives, or save only the dives selected in *Dive
 List* panel of _Subsurface_. Click the appropriate radio button (see images
@@ -2713,13 +2623,13 @@ A dive log or part of it can be saved in three formats:
   dive computers and computer programs.
 
 * _Divelogs.de_, an Internet-based dive log repository. In order to upload to
-  _Divelogs.de_, one needs a user-ID as well as a password for
+  _Divelogs.de_, you need a user-ID as well as a password for
   _Divelogs.de_. Log into _http://en.divelogs.de_ and subscribe to this
-  service in order to upload dive log data from _Subsurface_.
+  service to upload dive log data from _Subsurface_.
 
-* _DiveShare_ 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 _http://scubadiveshare.com_ is required.
+* _DiveShare_ is also a dive log repository on the Internet focusing on
+  recreational dives. To upload dives, you need a user ID, so registration
+  with _http://scubadiveshare.com_ is required.
 
 * _CSV dive details_, that includes the most critical information of the dive
   profile. Included information of a dive is: dive number, date, time, buddy,
@@ -2738,14 +2648,14 @@ A dive log or part of it can be saved in three formats:
   pressure, gas pressures and MOD. The HTML export contains a search option to
   search the dive log. HTML export is specified on the second tab of the
   Export dialog (image *B* above). A typical use of this option is to export
-  all one'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's
-  original logbook with one when doing dives with dive companies.
+  all one's 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.
 
 * _Worldmap_ format, an HTML file with a world map upon which each dive and
-  some information about it are indicated. This map is not editable. If one
-  selects any of the dive sites on the map, a summary of the dive is available
+  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.
 
 image::images/mapview_f20.jpg["Figure: HTML Map export view", align="center"]
@@ -2753,8 +2663,8 @@ image::images/mapview_f20.jpg["Figure: HTML Map export view", align="center"]
 
 * _Image depths_, which creates a text file that contains the file names of
   all photos or images attached to any of the selected dives in the _Dive
-  List_, together with the depth under water where of each of those photos
-  were taken.
+  List_, together with the depth underwater where of each of those photos was
+  taken.
 
 * _General Settings_, under the HTML tab, provides the following options:
 
@@ -2769,27 +2679,26 @@ image::images/mapview_f20.jpg["Figure: HTML Map export view", align="center"]
 * Under _Style Options_ some style-related options are available like font
   size and theme.
 
-Export to other formats can be achieved through third party facilities, for
+Export to other formats can be done through third party facilities, for
 instance _www.divelogs.de_.
 
 [[S_Cloud_access]]
 == Keeping a _Subsurface_ dive log in the Cloud
 
 For each diver, dive log information is highly important. Not only is it a
-record of diving activities for one's own pleasure, but it is important
-information required for admission to further training courses or
-(sometimes) even diving sites. The security of the dive log is therefore
-critical. In order to have a dive log that is resistant to failure of a home
-computer hard drive, loss or theft of equipment, the Cloud is an obvious
-solution. This also has the added benefit that one can access one's dive log
-from anywhere in the world without having to carry it with oneself. For this
+record of diving activities for one'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 you can access your dive log from anywhere in the world. For this
 reason, facilities such as _divelogs.de_ and _Diving Log_ offer to store
 dive log information on the Internet.
 
 _Subsurface_ 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
+local hard disk.  The only requirement is that you should first register as
 a user on the cloud.  To use _Subsurface cloud storage_ , follow these
 steps:
 
@@ -2813,45 +2722,45 @@ will be marked as verified and the _Subsurface cloud storage_ service is initial
 
 === Using _Subsurface cloud storage_
 
-** 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
    _File_ menu of the main menu system: _Open cloud storage_ and _Save to cloud storage_.
-These options allow the user to load and save data to the _Subsurface
+These options let you load and save data to the _Subsurface
 cloud storage_ server.
-** In the _Defaults Preferences_ tab, one can select to use the _Subsurface cloud
-storage_ data as one's default data file by checking the check box marked _Cloud storage default file_.
- This means that the data from
-the _Subsurface cloud storage_ is loaded when _Subsurface_ starts ans saved there when one closes _Subsurface_.
+** In the _Defaults Preferences_ tab, you can select to use the _Subsurface cloud
+storage_ data as the default data file by checking the box marked _Cloud storage default file_.
+ This means the data from
+the _Subsurface cloud storage_ is loaded when _Subsurface_ starts and saved there when _Subsurface_ closes.
 
 ** _Subsurface_ keeps a local copy of the data and the cloud facility remains fully
-functional even if used while disconnected to the Internet. _Subsurface_ 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. _Subsurface_ simply synchronizes the
+data with the cloud server the next time the program is used while the computer is
 connected to the Internet.
 
 [[S_Cloud_storage]]
 === Web access to _Subsurface cloud storage_
 
 One of the nice side benefits of using _Subsurface cloud storage_ is that
-one can also access one's dive data from any web browser. Simply open
+you can also access your dive data from any web browser. Simply open
 https://cloud.subsurface-divelog.org[_https://cloud.subsurface-divelog.org_],
 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 _Subsurface cloud storage_. The
-dive information that is shown is only the contents of the recorded dive
-logs, NOT the calculated values shown in the *Profile* panel, including some
-cylinder pressures, deco ceilings and O~2~/He/N~2~ partial pressures.
+the last dive data that was synced to _Subsurface cloud storage_. The dive
+information shown is only the contents of the recorded dive logs, NOT the
+calculated values shown in the *Profile* panel, including some cylinder
+pressures, deco ceilings and O~2~/He/N~2~ partial pressures.
 
 === Other cloud services
 
-If one prefers not to use the integrated cloud storage of dive logs (and
-don't need the web access), it is also simple to store dive logs in the
-cloud using several of the existing facilities on the Internet.  For
-instance http://www.dropbox.com/[_Dropbox_] offers a free application that
-allows files on the Dropbox servers to be seen as a local folder on one's
-desktop computer.
+If you prefers not to use the integrated cloud storage of dive logs (and
+don'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
+http://www.dropbox.com/[_Dropbox_] offers a free application that allows
+files on the Dropbox servers to be seen as a local folder on a desktop
+computer.
 
 image::images/Cloud.jpg["FIGURE: Dropbox folder", align="center"]
 
 The _Dropbox_ program creates a copy of the _Dropbox_ Internet Cloud content
-on one's desktop computer. When the computer is connected to the Internet,
+on your desktop computer. When the computer is connected to the Internet,
 the Internet content is automatically updated. Therefore both the _Open_ and
 _Save_ of dive logs are done using the local copy of the dive log in the
 local _Dropbox_ folder, so there's no need for a direct internet
@@ -2859,17 +2768,17 @@ connection. If the local copy is modified, e.g. by adding a dive, the remote
 copy in the _Dropbox_ server in the Cloud will be automatically updated
 whenever Internet access is available.
 
-In this way a dive log in one's _Dropbox_ folder can be accessed seamlessly
-from the Internet and can be accessed from any place with Internet
+In this way a dive log in your _Dropbox_ 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
 http://www.dropbox.com/install[_Install Page on the Dropbox website_]
-Alternatively one can use _Dropbox_ as a mechanism to backup one's dive
-log. To Store a dive log on _Dropbox_, select _File -> Save as_ from the
-_Subsurface_ main menu, navigate to the _Dropbox_ folder and select the
-_Save_ button. To access the dive log in _Dropbox_, select _File -> Open
-Logbook_ from the _Subsurface_ main menu and navigate to the dive log file
-in the _Dropbox_ folder and select the _Open_ button.
+Alternatively you can use _Dropbox_ as a way back up your dive log. To Store
+a dive log on _Dropbox_, select _File -> Save as_ from the _Subsurface_ main
+menu, navigate to the _Dropbox_ folder and select the _Save_ button. To
+access the dive log in _Dropbox_, select _File -> Open Logbook_ from the
+_Subsurface_ main menu and navigate to the dive log file in the _Dropbox_
+folder and select the _Open_ button.
 
 Several paid services exist on the Internet (e.g. Google, Amazon) where the
 same process could be used for the Cloud-based storage of dive logs.
@@ -2878,21 +2787,20 @@ same process could be used for the Cloud-based storage of dive logs.
 [[S_PrintDivelog]]
 == Printing a dive log
 
-_Subsurface_ provides a simple and flexible interface to print a whole dive log or only a few selected dives.
+_Subsurface_ 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.
 
-Before printing, two decisions are required:
+Some decisions need to be made before printing:
 
-- 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 *Dive List*
-  panel.
-- If the dive profiles needs printing, what gas partial pressure information
+- Should the whole dive log be printed or only part of it? If only part is
+  required, select the required dives from the *Dive List* panel.
+- 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 *Dive Profile* panel.
 
-If _File -> Print_ is selected from the Main menu, the the dialogue below
-(image *A*) appears. Three specifications are needed to achieve the desired
-information and page layout:
+If _File -> Print_ is selected from the Main menu, the dialogue below (image
+*A*) appears. Three specifications are needed to get the desired information
+and page layout:
 
 image::images/Print1_f22.jpg["FIGURE: Print dialogue", align="center"]
 
@@ -2904,14 +2812,14 @@ image::images/Print1_f22.jpg["FIGURE: Print dialogue", align="center"]
 
 2. Under _Print options_ select:
 
-- Printing only the dives selected from the dive list prior to activating the
+- Printing only the dives selected from the dive list before activating the
   print dialogue by checking the box _Print only selected dives_. If this
-  check box is *not* checked all dives in the *Dive List* panel are printed.
-- Printing in colour, achieved by checking the box with _Print in colour_. If
-  this check box is not checked, printing is in monochrome (grey scale).
+  check box is *not* checked ALL dives in the *Dive List* panel are printed.
+- 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.
 
 Under _Template_ select a template to be used as the page layout. There are
-several templates (see image *B*, above).
+several choices.  (see image *B*, above).
 
 - _Table_: This prints a summary table of all dives selected (see below).
 
@@ -2932,15 +2840,15 @@ image::images/print2_f22.jpg["FIGURE: Print one dive / page", align="center"]
 - _Two Dives_: Print two dives per page, also showing the dive profiles.
 - _Six Dives_: Print six dives per page, also showing the dive profiles.
 
-Users can _Preview_ the printed page by selecting the _Preview_ button on
-the dialogue (see image *A* 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.
+You can _Preview_ the printed page by selecting the _Preview_ button on the
+dialogue (see image *A* at the start of this section). After preview, you
+can change the options in the print dialogue, so the layout fits personal
+taste.
 
 Next, select the _Print_ button (see image *A* 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):
+section). This activates the regular print dialogue used by the operating
+system, letting you choose a printer and set its properties (see image
+below):
 
 image::images/Print_print_f22.jpg["FIGURE: Print dialog", align="center"]
 
@@ -2954,7 +2862,7 @@ image::images/Printpreview.jpg["FIGURE: Print preview page", align="center"]
 === Créer un modèle d'impression personnalisé (avancé)
 
 Writing a custom template is an effective way to produce highly customized
-printouts. Subsurface uses HTML templates to render printing. One can create
+printouts. Subsurface uses HTML templates 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 _Template_
 dropdown list in the print dialogue. See <<S_APPENDIX_E,APPENDIX E>> for
@@ -2963,16 +2871,16 @@ information on how to write or modify a template.
 [[S_Configure]]
 == Configurer un ordinateur de plongée
 
-_Subsurface_ permet de configurer son ordinateur de plongée. Actuellement,
-les familles d'ordinateurs supportés sont Heinrichs-Weikamp (OSTC 2, OSTC 3)
-et Suunto Vyper (Stinger, Mosquito, D3, Vyper, Vytec, Cobra, Gekko et
-Zoop). De nombreux paramètres de ces ordinateurs de plongée peuvent être
-lues et modifiées. La première étape est de s'assurer que les pilotes pour
-votre ordinateur de plongée sont installés (également nécessaire pour
-télécharger les plongées) et que le nom de périphérique de l'ordinateur de
-plongée est connu. Voir
-<<_appendix_a_operating_system_specific_information_for_importing_dive_information_from_a_dive_computer,ANNEXE
-A>> pour plus d'informations sur la manière de procéder.
+_Subsurface_ 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. 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
+<<_appendix_a_operating_system_specific_information_for_importing_dive
+_information_from_a_dive_computer,APPENDIX A>> for information on how to do
+this.
 
 Une fois que l'ordinateur de plongée est connecté à _Subsurface_,
 sélectionner _Fichier -> Configurer l'ordinateur de plongée_, à partir du
@@ -2982,8 +2890,8 @@ plongée à partir du panneau à gauche (voir l'image ci-dessous).
 
 image::images/Configure_dc_f20.jpg["FIGURE: Configure dive computer", align="center"]
 
-En utilisant les boutons appropriés du panneau de configuration, les actions
-suivantes peuvent être réalisées :
+Using the appropriate buttons on the configuration panel, the following
+actions can be done:
 
  - *Récupérer les détails disponibles*. Cela charge la configuration existante à partir de l'ordinateur de plongée
    dans _Subsurface_, en l'affichant dans le panneau de configuration.
@@ -3001,13 +2909,13 @@ suivantes peuvent être réalisées :
 == Setting user _Preferences_ for _Subsurface_
 
 There are several user-definable settings within _Subsurface_, found by
-selecting _File -> Preferences_. The settings are performed in seven groups:
+selecting _File -> Preferences_. The settings are in seven groups:
 *Defaults*, *Units*, *Graph*, *Language* and *Network*, *Facebook* and
-*Georeference*, 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 *Apply* button. After applying all the new settings users can then
-leave the settings panel by selecting *OK*. If *Discard* is selected,
-changes to the preferences are not saved.
+*Georeference*.  All operate on the same principles: the user must specify
+settings that are to be changed, then save them using the *Apply*
+button. After applying all the new settings users can then leave the
+settings panel by selecting *OK*. If *Discard* is selected, changes to the
+preferences are not saved.
 
 === Defaults
 
@@ -3015,18 +2923,18 @@ There are several settings in the *Defaults* panel:
 
 image::images/Pref1_f20.jpg["FIGURE: Preferences defaults page", align="center"]
 
-  ** *Lists and tables*: Here one can specify the font type and font size of the
-     *Dive Table* panel. By decreasing the font size of the *Dive Table*, users can see more dives on a screen.
+  ** *Lists and tables*: Here you can specify the font type and font size of the
+     *Dive Table* panel: By decreasing the font size of the *Dive Table*, you can see more dives on a screen.
 
-  ** *Dives*: For the _Default Dive File_ one needs to specify the directory and
-     file name of one's
+  ** *Dives*: For the _Default Dive File_ you need to specify the directory and
+     file name of your
      electronic dive log book. This is a file with filename extension of either _.xml_ or _.ssrf_. When
      launched, _Subsurface_ will automatically load the specified dive log book. There are three options:
      - _No default file_: When checked, _Subsurface_ does not automatically load a dive log at startup.
      - _Local default file_: When checked, _Subsurface_ automatically loads a dive log from the local hard disk
        as described above.
      - _Cloud storage default file_: When checked, _Subsurface automatically loads the dive log from the cloud
-       device that was initialised using the *Preferences* _Network_ tab (see below).
+       device that was initialized using the *Preferences* _Network_ tab (see below).
 
   ** *Display invalid*:  Dives can be marked as invalid (when a user wishes to hide
      dives that he/she doesn't consider valid dives, e.g. pool dives, but still want to
@@ -3050,14 +2958,14 @@ image::images/Pref1_f20.jpg["FIGURE: Preferences defaults page", align="center"]
 === Units
 image::images/Pref2_f20.jpg["FIGURE: Preferences Units page", align="center"]
 
-Here users can choose between metric and imperial units of depth, pressure,
+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 *Personalise* radio
-button, units can be selected independently, with some units in the metric
-system and others in imperial.
+button at the top, you can specify that all units are in the chosen
+measurement system.  Alternatively, if you select the *Personalize* radio
+button, units can be selected independently, with some in the metric system
+and others in imperial.
 
-Irrespective of the above settings, dive time measurements can be either in
+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 Choose the appropriate option.
@@ -3069,24 +2977,26 @@ image::images/Pref3_f20.jpg["FIGURE: Preferences Graph page", align="center"]
 [[S_GradientFactors]]
 This panel allows two type of selections:
 
-*Show*: Here users can specify the amount of information shown as part of
+*Show*: Here you can specify the amount of information shown as part of
 the dive profile:
 ** Thresholds: _Subsurface_ 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 *Dive Profile*
-   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 *Dive Profile*
+   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.
 ** _Max pO~2~ is used for calculating the MOD when displaying the maximum operative depth (MOD)
    for a dive. Specify an appropriate partial pressure. A value of 1.4 is commonly used.
-** _Draw dive computer reported ceiling red_: This checkbox allows exactly what it says. By default
+** _Draw dive computer reported ceiling red_: 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 _Subsurface_ because of the different algorithms and
-   gradient factors, as well as the dynamic way that a
-   dive computer can calculate ceilings during a dive.
-** _Show unused cylinders in Equipment Tab_: This checkbox allows display of information about unused cylinders when viewing the *Equipment Tab*. Conversely, if this box is not checked, and if any cylinders entered using the *Equipment Tab* are not used (e.g. there was no gas switch to such a cylinder), then these cylinders are omitted from that list.
-**  _Show average depth_: If this box is checked, the *Dive Profile* 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
+   gradient factors, as well as the dynamic way a
+   dive computer calculates ceilings during a dive.
+** _Show unused cylinders in Equipment Tab_: This checkbox allows display of information about unused cylinders when viewing the
+*Equipment Tab*. If this box is not checked, and if any cylinders entered using the *Equipment Tab* are not used (e.g. there
+was no gas switch to such a cylinder), then these cylinders are omitted from that list.
+**  _Show average depth_: If this box is checked, the *Dive Profile* 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.
 
 * *Misc*:
@@ -3095,8 +3005,8 @@ the dive profile:
 ** Gradient Factors (GFLow and GFHigh):* Set the _gradient factors_ 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
@@ -3108,8 +3018,8 @@ the dive profile:
 
  *** link:http://www.rebreatherworld.com/general-and-new-to-rebreather-articles/5037-gradient-factors-for-dummies.html[Gradient factors for dummies, by Kevin Watts]
 
- ** _CCR: Show setpoints when viewing pO2:_ With this checkbox ativated, the pO~2~
-    graph on the dive profile has an overlay in red which inticates the CCR setpoint
+ ** _CCR: Show setpoints when viewing pO2:_ With this checkbox activated, the pO~2~
+    graph on the dive profile has an overlay in red which indicates the CCR setpoint
     values. See the section on xref:S_CCR_dives[Closed Circuit Rebreather dives].
 
  ** _CCR: Show individual O~2~ sensor values when viewing pO~2~:_ Show the pO~2~
@@ -3123,7 +3033,7 @@ the dive profile:
     during a particular dive. Setpoint changes during the dive can be added via the
     profile context menu.
 
- ** _pSCR O~2~ metabolism rate:_ For a semiclosed rebreather (pSCR) system, this is the
+ ** _pSCR O~2~ metabolism rate:_ 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.
 
@@ -3137,22 +3047,21 @@ Choose a language that _Subsurface_ will use.
 
 image::images/Pref4_f20.jpg["FIGURE: Preferences Language page", align="center"]
 
-A checkbox allows one to use the _System Default_ language which in most
-cases will be the correct setting; with this _Subsurface_ 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
-_Filter_ text box allows one to list similar languages. For instance there
-are several system variants of English or French. *This particular
-preference requires a restart of _Subsurface_ to take effect*.
+A checkbox lets you use the _System Default_ language which in most cases
+will be the correct setting; with this _Subsurface_ simply runs in the same
+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 _Filter_ text box lists similar languages. For
+instance there are several system variants of English or French. *This
+particular preference requires a restart of _Subsurface_ to take effect*.
 
 === Network
 This panel facilitates communication between _Subsurface_ and data sources
 on the Internet.  This is important, for instance, when _Subsurface_ needs
-to communicate with Internet services such as Cloud storage or the
+to communicate with web services such as Cloud storage or the
 <<S_Companion,_Subsurface Companion app_>>. These Internet requirements are
-determined by one's type of connection to the Internet and by the Internet
-Service Provider (ISP) used.  One's ISP should provide the appropriate
+determined by your type of connection to the Internet and by the Internet
+Service Provider (ISP) used.  Your ISP should provide the appropriate
 information.
 
 image::images/Pref5_f20.jpg["FIGURE: Preferences Network page", align="center"]
@@ -3167,54 +3076,52 @@ password are required so that _Subsurface_ can automatically pass
 through the proxy server to access the Internet. This information is usually obtained
 from one's ISP.
 
-** _Subsurface cloud storage_: To store one's dive log in the cloud, a valid email address
-   and password are required. This allows _Subsurface_ to email security information
-   regarding cloud storage to a user, and to set up the cloud storage appropriately.
+** _Subsurface cloud storage_: To store your dive log in the cloud, a valid email address
+   and password are required. This lets _Subsurface_ email security information
+   regarding cloud storage to you, and to set up cloud storage appropriately.
    Two additional options are given:
    - _Sync to cloud in the background_: This option allows saving of dive information to the cloud storage
-   while the user performs other tasks within _Subsurface_.
+   while you do other things within _Subsurface_.
    - _Save password locally_: This allows local storage of the cloud storage password. Note that this
    information is saved in raw text form, not encoded in any way.
 
-** _Subsurface web service_: When one subscribes to the <<S_Companion,Subsurface web service>>, a very
+** _Subsurface web service_: When you subscribe to the <<S_Companion,Subsurface web service>>, a very
      long and hard-to-remember userID is issued. This is the place to save that userID. By
-     checking the option _Save User ID locally?_, one ensures that a local copy of that userID
-     is saved.
+     checking the option _Save User ID locally?_, you ensure a local copy of that userID is saved.
 
 
 [[S_Facebook]]
-=== Accès Facebook
-Ce panneau vous permet de vous connecter à votre compte Facebook pour
-transférer des informations de Subsurface vers Facebook.
+=== Facebook Access
+This panel lets you log into a Facebook account in order to transfer
+information from Subsurface to Facebook.
 
 image::images/Pref6_f20.jpg["FIGURE: Facebook login panel", align="center"]
 
-Si un identifiant Facebook et un mot de passe valides ont été fournis, une
-connexion vers Facebook est créée. Cette connexion est fermée lorsque
-Subsurface est fermé. Pour le moment, la case à cocher nommée "Conserver ma
-connexion à Subsurface", sur l'écran de connexion, n'a aucun
-effet. Reportez-vous à la section xref:S_facebook[Export des profils de
-plongée vers Facebook] pour plus d'informations.
+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
+xref:S_facebook[Exporting dive profiles to Facebook] for more information.
 
 === Georeference
 
 _Subsurface_ provides a geo-lookup service (that is, given the coordinates
-of a dive site (derived from a click on the *Dive Map panel* at the bottom
+of a dive site) derived from a click on the *Dive Map panel* at the bottom
 right of the _Subsurface_ window, or from a GPS instrument or from the
-_Subsurface_ Companion app), a lookup on the Internet is performed to find
-the name of the closest known location. Obviously this function only works
-if _Subsurface_ has an Internet connection. The preference of the dive site
-name can be configured, e.g. _Country/State/City_ or _City/State/Country_
-(see image below).
+_Subsurface_ Companion app). A search on the Internet is done to find the
+name of the closest known location. This function only works if _Subsurface_
+has an Internet connection. The preference of the dive site name can be
+configured, e.g. _Country/State/City_ or _City/State/Country_ (see image
+below).
 
 image::images/Pref7_f20.jpg["FIGURE: Facebook login panel", align="center"]
 
 [[S_DivePlanner]]
 == The _Subsurface_ dive planner
-Dive planning is an advanced feature of _Subsurface_, accessible by
-selecting _Log -> Plan Dive_ 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.
+Dive planning is an advanced feature of _Subsurface_, accessed by selecting
+_Log -> Plan Dive_ 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.
 
 ****
 [icon="images/icons/warning2.png"]
@@ -3241,12 +3148,11 @@ used under the following conditions:
 
 Like the _Subsurface_ dive log, the planner screen is divided into several
 sections (see image below). The *setup* 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.
+into the sections on the left hand side of the screen.  They are: Available
+Gases, Rates, Planning, Gas Options and Notes.
 
-At the top right hand is a green *design panel* upon which the profile of
-the dive can be manipulated directly by dragging and clicking as explained
+At the top right hand is a green *design panel* on which the profile of the
+dive can be manipulated directly by dragging and clicking as explained
 below. This feature makes the _Subsurface_ dive planner unique in ease of
 use.
 
@@ -3260,17 +3166,17 @@ image::images/PlannerWindow1_f20.jpg["FIGURE: Dive planner startup window", alig
 
 === Open circuit dives
 
--  Towards the centre bottom of the planner (circled in blue in the image
+-  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:
  ** Open Circuit (the default)
  ** CCR
  ** pSCR
 
 - Choose the Open Circuit option.
-- In the top left-hand area of the planning screen, ensure that the constant
-  dive parameters are appropriate. These are: Start date and time of the
-  intended dive, Atmospheric Pressure and Altitude above sea level of the dive
-  site. The atmospheric pressure can also be entered as an altitude in metres,
+- 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 meters,
   assuming a sea-level atmospheric pressure of 1.013 bar.
 
 - In the table labelled _Available Gases_, add the information of the
@@ -3285,11 +3191,11 @@ image::images/PlannerWindow1_f20.jpg["FIGURE: Dive planner startup window", alig
   the top right-hand of the dialogue.
 
 - The profile of the planned dive can be created in two ways:
- *  Drag the waypoints (the small white circles) on the existing dive profile in
-    a way to represent the dive. Additional waypoints can be created by
-    double-clicking the existing dive profile. Waypoints can be deleted by
-    right-clicking a particular waypoint and selecting the _delete_ item from
-    the resulting context menu.
+ *  Drag the waypoints (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 _delete_ item from the resulting
+    context menu.
  *  The most efficient way to create a dive profile is to enter the appropriate
     values into the table marked _Dive planner points_. The first line of the
     table represents the duration and the final depth of the descent from the
@@ -3302,29 +3208,24 @@ image::images/PlannerWindow1_f20.jpg["FIGURE: Dive planner startup window", alig
 
 ==== Recreational dives
 
-Recreational mode is what comes closest to planning a dive based on the
-non-decompression limit (NDL).  It computes the maximal time a diver can
-stay at the current depth without incurring any mandatory decompression
-stops and without using more than the existing gas (minus a reserve). The
-planner automatically takes into account the nitrogen load incurred in
-previous dives. But conventional dive tables are also used in a way that can
-take into account previous dives. Why use a dive planner for recreational
-dives? Using recreational dive tables, the maximum depth of a dive is taken
-into account. However, few dives are undertaken at a constant depth
-corresponding to the maximum depth (i.e. a "square" dive profile). This
-means that dive tables overestimate the nitrogen load incurred during
-previous dives. The _Subsurface_ 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 'credit' 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 _Subsurface_ before performing dive planning.
-
+Recreational mode is what comes closest to planning a dive based on the non-decompression limit (NDL).
+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. 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 _Subsurface_
+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 'credit,'
+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's crucial to upload all previous dives
+onto _Subsurface_ before doing dive planning.
 To plan a dive, the appropriate settings need to be defined.
 
-Ensure that the date and time is set to that of the intended dive. This
-allows calculation of the nitrogen load incurred during previous dives.
+Ensure the date and time is set to that of the intended dive. This allows
+calculation of the nitrogen load incurred during previous dives.
 
 - Immediately under the heading _Planning_ are two checkboxes _Recreational_
   and _Safety Stop_.  Check these two boxes.
@@ -3334,24 +3235,23 @@ allows calculation of the nitrogen load incurred during previous dives.
   _Available gases_.
 
 - The planner calculates whether the specified cylinder contains enough
-  air/gas to complete the planned dive. In order for this to be realistic,
+  air/gas to complete the planned dive. In order for this to be accurate,
   under _Gas options_, specify an appropriate surface air consumption (SAC)
   rate for _Bottom SAC_. Suitable values are between 15 l/min and 30 l/min,
   with novice divers or difficult dives requiring SAC rates closer to 30l/min.
 
-- 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'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 _Subsurface_
-  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's
-  pulse rate goes up when one starts to buddy breathe. This reserve amount is
-  user configurable.
+- 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 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 _Subsurface_ 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's supposed to be for the additional gas used
+  when there's a problem and your pulse rate goes up when you start to buddy
+  breathe. This reserve amount is user configurable.
 
 - Define the depth of the dive by dragging the waypoints (white dots) on the
   dive profile or (even better) defining the appropriate depths using the
@@ -3365,9 +3265,9 @@ allows calculation of the nitrogen load incurred during previous dives.
 - The ascent speed can be changed. The default ascent speeds are those
   considered safe for recreational divers.
 
-The dive profile in the planner indicates the maximum dive time within
-no-deco limits using the Bühlmann ZH-L16 algorithm and the gas and depth
-settings specified as described above. The _Subsurface_ planner allows rapid
+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 _Subsurface_ 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
@@ -3378,36 +3278,36 @@ means that recreational dive limits are exceeded and either the dive
 duration or the dive depth needs to be reduced.
 
 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.
+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.
 
 image::images/rec_diveplan.jpg["FIGURE: A recreational dive plan: setup", align="center"]
 
 ==== Non-recreational open circuit dives, including decompression
 
 Non-recreational dive planning involves exceeding the no-deco limits and/or
-using multiple breathing gases.  Such dives are planned in three stages:
+using multiple breathing gases.  These dives are planned in three stages:
 
-*a) Nitrogen management*: This is performed by specifying the rates for descent and ascent,
+*a) Nitrogen management*: 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 _Rates_ and _Planning_
 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 _Preferences_
 panel of _Subsurface_ is used. If these are changed within the planner (see _Gas Options_ within
 the planner), the new values are
-used without changing the original values in the _Preferences_. 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 _Preferences_.
+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 xref:S_GradientFactors[Gradient Factor Preference settings].
 
 If the VPM-B model is selected, the Conservatism_level needs to be specified
 on a scale of 0 (least conservative) to 4 (most conservative).  This model
 tends to give deco stops at deeper levels than the Bühlmann model and often
 results in slightly shorter dive durations than the Bühlmann model. When
-selecting one of these models, keep in mind that they are NOT exact
-physiological models but only mathematical models that appear to work in
-practice.
+selecting one of these models, keep in mind they are NOT exact physiological
+models but only mathematical models that appear to work in practice.
 
 For more information external to this manual see:
 
@@ -3421,14 +3321,14 @@ for Divers_, by Mark Powell (2008). Aquapress] Southend-on-Sea, UK. ISBN 10:
 modèles de décompression Bühlmann et VPM-B.
 
 The ascent rate is critical for nitrogen off-gassing at the end of the dive
-and is specified for several depth ranges, utilising the average (or mean)
-depth as a yardstick. The mean depth of the dive plan is indicated by a
-light grey line on the dive profile. Ascent rates at deeper levels are often
-in the range of 8-12 m/min, while ascent rates near the surface are often in
-the range of 4-9 m/min. The descent rate is also specified. If the option
-_Drop to first depth_ is activated, then the descent phase of the planned
-dive will be at the maximal descent rate specified in the _Rates_ section of
-the dive setup.
+and is specified 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 _Drop
+to first depth_ is activated, the descent phase of the planned dive will be
+at the maximal descent rate specified in the _Rates_ section of the dive
+setup.
 
 *b) Oxygen management*: In the *Gas Options* part of the dive specification, the maximum partial
 pressure for oxygen needs to be specified for the
@@ -3439,57 +3339,57 @@ stages. Normally, a partial pressure of 1.6 bar is not exceeded. PO2 settings an
 _Available Gases_ 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.
 
-*c) Gas management*: With open-circuit dives this is a primary consideration. One needs to keep within the limits of the amount of gas within the dive
+*c) Gas management*: 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 _Gas Options_ 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 (_bottom SAC_) as well as during the decompression or safety stops of the
-dive (_deco SAC_). Values of 15-30 l/min are common. For good gas management, a thumbsuck guess
-is not sufficient and one needs to
-monitor one's gas consumption on a regular basis, dependent on different dive conditions and/or equipment.
+dive (_deco SAC_). 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.
 
-Now (at last) one can start the detailed time-depth planning of the
-dive. _Subsurface_ offers a unique graphical interface for performing this
-part of the planning. The mechanics of doing this is similar to
-hand-entering a dive profile in the dive log part of _Subsurface_. Upon
-activating the planner, a default dive of depth 15 m for 40 min is offered
-in the bue design surface to the top right hand of the screen. The white
-dots (waypoints) on the profile can be dragged with a mouse. Create more
-waypoints by double-clicking on the profile line and ensuring that the
-profile reflects the intended dive. Drag the waypoints to represent the
-depth and duration of the dive. It is NOT necessary to specify the ascent
-part of the dive since the planner calculates this, based on the settings
-that have been specified.  If any of the management limits (for nitrogen,
-oxygen or gas) is exceeded, the surface above the dive profile changes from
-BLUE to RED.
+Now you can start the detailed time-depth planning of the dive. _Subsurface_
+offers an unique graphical interface for doing planning. Themechanics are
+similar to hand-entering a dive profile in the dive log part of
+_Subsurface_. Upon activating the 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 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) are exceeded, the surface above the dive profile
+changes from BLUE to RED.
 
 Each waypoint on the dive profile creates a _Dive Planner Point_ in the
-table on the left of the dive planner panel. Ensure that the _Used Gas_
-value in each row of that table corresponds to one of the gas mixtures
-specified in the _Available Gases_ 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 _Subsurface_. In most cases _Subsurface_ computes additional way
-points in order to fulfil decompression requirements for that dive. A
-waypoint can be moved by selecting that waypoint and by using the arrow
-keys.  The waypoints listed in the _Dive Planner Points_ dialogue can be
-edited by hand in order to obtain a precise presentation of the dive
-plan. In fact, one can create the whole dive profile by editing the _Dive
-Planner Points_ dialog.
-
-Indicate any changes in gas cylinder used by indicating gas changes as
-explained in the section <<S_CreateProfile,hand-creating a dive
-profile>>. These changes should reflect the cylinders and gas compositions
-defined in the table with _Available Gases_.  If two or more gases are used,
-automatic gas switches will be suggested during the ascent to the
-surface. However, these changes can be deleted by right-clicking the gas
-change and by manually creating a gas change by right-clicking on the
-appropriate waypoint.
+table on the left of the dive planner panel. Be sure the _Used Gas_ value in
+each row of that table corresponds to one of the gas mixtures specified in
+the _Available Gases_ 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
+_Subsurface_. In most cases _Subsurface_ 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 _Dive Planner Points_ dialogue can be edited by hand in order to get a
+precise presentation of the dive plan. In fact, you can create the whole
+dive profile by editing the _Dive Planner Points_ dialog.
+
+Show any changes in gas cylinder used by indicating gas changes as explained
+in the section <<S_CreateProfile,hand-creating a dive profile>>. These
+changes should reflect the cylinders and gas compositions defined in the
+table with _Available Gases_.  If two or more gases are used, automatic gas
+switches will be suggested during the ascent to 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.
 
 A non-zero value in the "CC set point" column of the table of dive planner
 points indicates a valid setpoint for oxygen partial pressure and that the
@@ -3505,9 +3405,9 @@ using EAN50 and using the settings as described above.
 
 image::images/DivePlanner2_f20.jpg["FIGURE: Planning a dive: setup", align="center"]
 
-Once the above has been completed, one can save it by clicking the _Save_
-button towards the top middle of the planner. The saved dive plan will
-appear in the *Dive List* panel of _Subsurface_.
+Once the above steps have been completed, save by clicking the _Save_ button
+towards the top middle of the planner. The saved dive plan will appear in
+the *Dive List* panel of _Subsurface_.
 
 *The dive plan details*
 
@@ -3534,7 +3434,7 @@ The parameters of the pSCR dive can be set by selecting  _File ->   Preferences
 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~2~ drops below what is considered a save value, a warning appears in the _Dive plan
+pO~2~ drops below what is considered safe, a warning appears in the _Dive plan
 details_. A typical pSCR configuration is with a single cylinder and one or more bail-out
 cylinders. Therefore the setup of the _Available gases_ and the _Dive planner points_ tables
 are very similar to that of a CCR dive plan, described below. However, no oxygen setpoints
@@ -3558,30 +3458,30 @@ cylinder since it is implied when the _CCR_ dropdown selection is made.
 the main menu. All user-entered segments in the _Dive planner points_ table
 use the default setpoint value. Then, different setpoints can be specified for dive segments
 in the _Dive planner points_ 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.
+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.
 
 The dive profile for a CCR dive may look something like the image below.
 
 image::images/Planner_CCR1_f20.jpg["FIGURE: Planning a CCR dive: setup", align="center"]
 
 Note that, in the _Dive plan details_, the gas consumption for a CCR segment
-is not calculated, so gas consumptions of 0 litres are the norm.
+is not calculated, so gas consumptions of 0 liters are the norm.
 
 [[S_Replan]]
 === Modifying an existing dive plan
 
 Normally, when a dive plan has been saved, it is accessible from the *Dive
-List*, like any other dive log. Within the *Dive List* there is not a way to
-change a saved dive plan.  To perform changes to a dive plan, select it on
-the *Dive List*. Then, in the main menu, select _Log -> Re-plan dive_. This
-will open the selected dive plan within the dive planner, allowing changes
-to be made and saved as usual.
+List*, like any other dive log. Within the *Dive List* there is no way to
+change a saved dive plan.  To change a dive plan, select it on the *Dive
+List*. Then, in the main menu, select _Log -> Re-plan dive_. This will open
+the selected dive plan within the dive planner, letting changes be made and
+saved as usual.
 
-In addition there is the option "Save new". This keeps the original planned
+In addition, there is the option "Save new". This keeps the original planned
 dive and adds a (possibly modified) copy to the dive list. If that copy is
 saved with the same start time as the original, the two dives are considered
 two versions of the same dive and do not influence other each during
@@ -3590,27 +3490,27 @@ decompression calculation (see next section).
 === Planning for repetitive dives
 
 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 _Start
-Time_ field. _Subsurface_ calculates the gas loading figures correctly and
-the effect of the first dive is evaluated on later dives.
+repetitive dive set are specified appropriately in the top left-hand _Start
+Time_ field. _Subsurface_ calculates the gas loading figures and the affect
+of the first dive is evaluated on later dives.
 
-If one has just completed a long/deep dive and is planning another dive,
-then highlight, in the *Dive List*, 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.
+If you have just completed a long/deep dive and are planning another dive,
+then highlight, in the *Dive List*, 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.
 
 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 *Dive List* and activate the planner: the planner takes
-into account the configuration in the highlighted dive.
+template dive can be created conforming to one of the configurations. If you
+want to plan a dive using this configuration, highlight the template dive in
+the *Dive List* and activate the planner: the planner takes into account the
+configuration in the highlighted dive.
 
 === Printing the dive plan
 
 Selecting the _Print_ button in the planner allows printing of the _Dive
-Plan Details_ for wet notes. Alternatively one can cut and paste the _Dive
-Plan Details_ for inclusion in a text file or word processing document.
+Plan Details_ for wet notes. You can also cut and paste the _Dive Plan
+Details_ to include in a text file or word processing document.
 
 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
@@ -3621,7 +3521,7 @@ Details_ 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 _File -> Print_
-facility on the main menu in the same way as for dive logs or by copy and
+function on the main menu in the same way as for dive logs or by copy and
 paste to a word processor.
 
 == Description des éléments du menu principal de Subsurface
@@ -3633,16 +3533,14 @@ des sections de ce manuel traitant des opérations relatives.
 === Fichier
 - <<S_NewLogbook,_Nouveau carnet de plongée_>> - Fermer le carnet de plongée
   actuellement ouvert et supprime toutes les informations de plongées.
-- _Ouvrir un carnet de plongée_ - Cela ouvre une fenêtre pour sélectionner le
-  carnet de plongée à ouvrir.
+- _Open logbook_ - Open the file manager to select a dive logbook to open.
 - _Open cloud storage_ - Open the dive log previously saved in
   <<S_Cloud_storage,_Cloud storage_>>.
-- _Sauvegarder_ - Enregistrer le carnet de plongée qui est actuellement
-  ouvert.
+- _Save_ - Save the dive logbook currently open.
 - _Save to cloud storage_ - Save the current dive log to
   <<S_Cloud_storage,_Cloud storage_>>.
 - _Enregsitrer sous_ - Enregistrer le carnet actuel sous un nom différent.
-- _Fermer_ - Fermer le carnet de plongée actuellement ouvert.
+- _Close_ - Close the dive logbook currently open.
 - <<S_ExportLog,_Exporter_>> - Exporter le carnet de plongée actuellement
   ouvert (ou les plongées sélectionnées dans le carnet) vers un des nombreux
   formats.
@@ -3672,15 +3570,14 @@ des sections de ce manuel traitant des opérations relatives.
 === Journal (log)
 - <<S_EnterData,_Ajouter une plongée_>> -  Ajouter manuellement une nouvelle
   plongée au panneau de la *liste des plongées*.
-- _Edit dive_ - Edit a dive of which the profile was entered by hande and not
-  from a dive computer.
-- <<S_DivePlanner,_Planifier une plongée_>> - Cette fonctionnalité permet de
-  planifier des plongées.
+- _Edit dive_ - Edit a dive where the profile was entered by hand and not from
+  a dive computer.
+- <<S_DivePlanner,_Planifier une plongée_>> - Planifier des plongées.
 - <<S_Replan,_Modifier la plongée dans le planificateur_>> - Modifier une
   plongée planifiée qui a été enregistrée dans la *liste des plongées*.
-- <<S_CopyComponents,_Copier les composants de la plongée_>> - En
-  sélectionnant cette option, vous pouvez copier les informations de plusieurs
-  champs d'un journal de plongée vers le presse-papier.
+- <<S_CopyComponents,_Copier les composants de la plongée_>> - Copier les
+  informations de plusieurs champs d'un journal de plongée vers le
+  presse-papier.
 - _Coller les composants de la plongée_  - Colle, dans les plongées
   sélectionnées dans la *liste des plongées*, les informations copiées au
   préalable avec l'option _Copier les composants de la plongée_.
@@ -3689,7 +3586,7 @@ des sections de ce manuel traitant des opérations relatives.
 - <<S_Group,_Grouper automatiquement_>> - Grouper les plongées du panneau de
   *liste des plongées* dans des voyages de plongées.
 - <<S_DeviceNames,_Editer les noms des ordinateurs de plongée_>> - Modifier
-  les noms des ordinateurs de plongée pour faciliter vos journaux (logs).
+  les noms des ordinateurs de plongée pour coordonner vos journaux (logs).
 - <<S_Filter,_Filtrer la liste des plongées_>> - Sélectionner seulement
   certaines plongées, à partir de tags ou de critères de plongées.
 
@@ -3705,9 +3602,8 @@ des sections de ce manuel traitant des opérations relatives.
   mondiale*.
 - _Statistiques annuelles_  - Affiche par année le résumé des statistiques des
   plongées effectuées.
-- _Prev DC_ - If a single dive was logged from more than one dive computer,
-  switch to data from
-   ordinateur de plongée précédent.
+- _Prev DC_ - Switch to data from previous dive computer, if a single dive was
+  logged from more than one.
 - _Ordinateur suivant_  - Passer à l'ordinateur de plongée suivant.
 - _Plein écran_  - Passer en mode plein écran.
 
@@ -3734,9 +3630,9 @@ des sections de ce manuel traitant des opérations relatives.
 === Assurez-vous que les pilotes (drivers) nécessaires sont installés
 [icon="images/icons/drivers.jpg"]
 [NOTE]
-Le système d'exploitation de l'ordinateur nécessite les bons pilotes pour
-communiquer avec l'ordinateur de plongée de la façon utilisée par
-l'ordinateur de plongée (Bluetooth, USB, infra-rouge).
+The operating system of the desktop computer needs the appropriate drivers
+in order to communicate with the dive computer, the way the dive computer
+prefers (e.g. Bluetooth, USB, infra-red).
 
 	* Sous Linux, les utilisateurs doivent avoir le bon module noyau de chargé. La
 	  plupart des distributions Linux le font automatiquement, de telle sorte que
@@ -3760,12 +3656,11 @@ de documents et logiciels Silicon Labs].
 === Comment trouver le nom du périphérique branché sur USB et paramétrer les permissions en écriture
 [icon="images/icons/usb.jpg"]
 [NOTE]
-Lorsqu'un utilisateur connecte un ordinateur de plongée en utilisant l'USB,
-généralement _Subsurface_ proposera soit une liste déroulante contenant le
-bon nom (ou le point de montage pour un Uemis Zurich) ou la liste sera
-désactivée si aucun nom de périphérique n'est nécessaire. Dans les rares cas
-où cela ne fonctionnerait pas, voici quelques suggestions pour trouver le
-nom de votre périphérique ;
+When connecting a dive computer by using a USB connector, usually
+_Subsurface_ 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't work, here are some ways to find out what the device name is:
 
 .Sur Windows :
 
@@ -3810,13 +3705,15 @@ détecté et connecté sur +ttyUSB3+. Cette information peut à présent être
 utilisée pour les paramètres d'importation en tant que +/dev/ttyUSB3+ pour
 que Subsurface utilise le bon port USB.
 
-S'assurer que l'utilisateur possède les droits d'écriture sur le port série
-USB :
+Ensuring the user has write permission to the USB serial port:
 
-Sur les systèmes similaires à Unix, les ports USB ne peuvent être accédés
-que par des utilisateurs membres du groupe +dialout+. Si vous n'êtes pas
-root, vous n'êtes peut-être pas membre de ce groupe et ne pouvez donc pas
-utiliser le port USB. Si votre nom d'utilisateur est 'johnB' :
+On Unix-like operating systems the USB ports can only be accessed by users
+who are members special group that can be e.g.  +dialout+ or +uucp+. This
+can be verified by listing the appropriate device permissions e.g. by +ls -l
+/dev/ttyUSB0+. Note that the number in the file name depends on how many USB
+devices you have connected, and must be adjusted appropriately.  If one is
+not root, one may not be a member of that group and won't be able to use the
+USB port. Let us assume one's username is 'johnB'.
 
 En tant que root, tapez : usermod -a -G dialout johnB+ (utilisateurs
 d'Ubuntu : +sudo usermod -a -G dialout johnB+)  Cela ajoute johnB au groupe
@@ -3826,7 +3723,9 @@ vérifiez que
 l'appartenance au groupe est bien effectif. Le groupe +dialout+ devrait
 être listé
 parmi les différents IDs.
-Sous certaines circonstances, les modifications ne prennent effet qu'après une déconnexionpuis reconnexion sur l'ordinateur (sous Ubuntu, par exemple).
+Sous certaines circonstances, les modifications ne prennent effet qu'après une déconnexion
+puis reconnexion sur l'ordinateur (sous Ubuntu, par exemple).
+
 Avec le bon nom de périphérique (par exemple +dev/ttyUSB3+) et avec un accès
 en écriture au port USB, l'ordinateur de plongée devrait se connecter et
 vous devriez pouvoir importer vos plongées.
@@ -3838,10 +3737,10 @@ vous devriez pouvoir importer vos plongées.
 [NOTE]
 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
+different procedure to get the device’s name to communicate with
 _Subsurface_. Follow these steps:
 
- * *For the dive computer, after enabling Bluetooth, ensure it is in Upload mode.*
+ * *For the dive computer, after enabling Bluetooth, be sure it is in Upload mode.*
 
 For Bluetooth pairing of the dive computer, refer to the manufacturer's user
 guide. When using a Shearwater Predator/Petrel/Nerd, select _Dive Log ->
@@ -3872,18 +3771,17 @@ Device..._. 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.
 
-Once the pairing is completed the correct device is shown in the 'Device or
+Once the pairing is complete, the correct device is shown in the 'Device or
 Mount Point' drop-down in the _Subsurface_ *Import* dialog.
 
 ==== Sur Linux
-Ensure Bluetooth is enabled on the _Subsurface_ computer.  On most common
+Be sure Bluetooth is enabled on the _Subsurface_ computer.  On most common
 distributions this should be true out of the box and pairing should be
-straight forward. For instance, Gnome3 shows a Bluetooth icon on the right
-of the toolbar at the top of the screen.  Users have reported difficulties
-with some Bluetooth controllers.  If you have an onboard controller, try
-that first.  It is simplest if you remove any USB Bluetooth dongles.  If you
-have a USB dongle that came with your dive computer, try that before any
-others.
+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 came with your dive computer, try that before any others.
 
 Setting up a connection to download dives from your Bluetooth-enabled
 device, such as the _Shearwater Petrel_, is not yet an automated process and
@@ -3920,7 +3818,7 @@ select 'Add new device'. 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.
 
-If the graphical method didn't work, pair the device from the command
+If the graphical method doesn't work, pair the device from the command
 line. Open a terminal and use +hciconfig+ to check the Bluetooth controller
 status
 
@@ -4070,9 +3968,9 @@ system of the Uemis) including information about dive spots and
 equipment. Buddy information is not yet downloadable.  Things are very
 similar to a normal USB-connected dive computer (the Uemis is one of those
 that recharge when connected to the USB port).  The main difference is that
-one does not enter a device name, but instead the location where the
-UEMISSDA file system is mounted once connected to the dive computer. On
-Windows this is a drive letter ( often 'E:' or 'F:'), on a Mac this is
+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 'E:' or 'F:'), on a Mac this is
 '/Volumes/UEMISSDA' and on Linux systems this differs depending on the
 distribution. On Fedora it usually is
 '/var/run/media/<your_username>/UEMISSDA'. In all cases _Subsurface_ should
@@ -4080,15 +3978,15 @@ suggest the correct location in the drop down list.
 
 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 _Subsurface_ issue) is that one
+(this is a Uemis firmware limitation, not a _Subsurface_ 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
+the SDA. This will usually only 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 _Subsurface_
-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
+displays an error 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 may have to do this
+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.
 
 [[S_ImportingGalileo]]
@@ -4108,14 +4006,14 @@ http://irda.sourceforge.net/docs/startirda.html[Linux IrDA Project].  After
 the installation of the irda-tools, the *root user* can specify a device
 name from the console as follows: +irattach irda0+
 
-After executing this command, Subsurface will recognise the Galileo dive
+After executing this command, Subsurface will recognize the Galileo dive
 computer and download dive information.
 
 Under Windows, a similar situation exists. Drivers for the MCS7780 are
 available from some Internet web sites e.g.
 http://www.drivers-download.com/Drv/MosChip/MCS7780/[www.drivers-download.com].
 Windows-based IrDA drivers for the Uwatec can also be downloaded from the
-ScubaPro web site, drivers being located on the download page for the
+ScubaPro web site, with drivers located on the download page for the
 ScubaPro SmartTrak software.
 
 For the Apple Mac, IrDA communication via the MCS7780 link is not available
@@ -4169,9 +4067,9 @@ Download of dive logs from the MkVI is performed using a custom
 communications adapter and the _Poseidon PC Configuration Software_,
 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
+logs. Communication between dive computer and desktop computer utilizes the
 IrDA infra-red protocol. Only data for one dive can be downloaded at a time,
-comprising three files:
+in three files:
 
 - Setup configuration for the dive and key dive parameters (file with a .txt
   extension)
@@ -4179,7 +4077,7 @@ comprising three files:
 - Redbook format dive log (file with .cvsr extension). This is a compressed
   version of the dive log using a proprietary format.
 
-_Subsurface_ accesses the .txt and the .csv files to obtain dive log
+_Subsurface_ accesses the .txt and the .csv files to get dive log
 information.
 
 
@@ -4205,29 +4103,29 @@ _Subsurface_ as follows:
   file with a filename extension of _.apd_
 - Within _Subsurface_, select _Import -> Import log files_ to open the
   xref:Unified_import[universal import dialogue].
-- In the dropdown list towards the bottom right of the dialogue (labled
+- In the dropdown list towards the bottom right of the dialogue (labeled
   'Filter:'), select "APD log viewer".
-- On the list of file names select the _.apd_ file that has been created
-  above. An import dialogue opens indicating the default settings for the data
-  in the _.apd_ file. If any changes are required, do this as for
-  xref:S_ImportingCSVDives[CSV imports].
+On the list of file names select the _.apd_ file  created. An import
+dialogue opens showing the default settings for the data in the
+_.apd_ file. If changes are required,
+  do this as for xref:S_ImportingCSVDives[CSV imports].
 
 image::images/APD_CSVimportF22.jpg["Figure: APD log viewer import", align="center"]
 
-- The top left hand dropdown box in the import panel allows one to select the
-  APD dive computer for which the dive log needs to be imported. The default
-  it is DC1, _i.e._ 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.(*Hint*: The logs for the two dive computers are
-  viewed by selecting _View -> Next DC_ from the Main Menu after the uploading
-  has been completed)
+- 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, _i.e._ 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.(*Hint*: The logs for the two dive computers are viewed by
+  selecting _View -> Next DC_ from the Main Menu after the uploading has been
+  completed)
 - Click the _Ok_ button at the bottom of the import panel.
 
-The APD dive log will appear within _Subsurface_. The dive
-computer-generated ceiling generated by the Inspiration can be viewed by
-selecting the appropriate button on the left of the *Dive Profile*. Cylinder
-pressure data are not logged by the APD equipment but can be manually
-entered in the _Equipment_ Tab.
+The APD dive log will appear within _Subsurface_. The dive computer-
+generated ceiling provided by the Inspiration can be viewed by selecting the
+appropriate button on the left of the *Dive Profile*. Cylinder pressure data
+are not logged by the APD equipment but can be manually entered in the
+_Equipment_ Tab.
 
 == APPENDIX C: Exporting Dive log information from external dive log software.
 
@@ -4280,16 +4178,16 @@ naming conventions to export dive log data.
 *Divemanager 4 (DM4) and Divemanager 5 (DM5):*
 
 DM4 and DM5 use identical mechanisms for exporting dive logs.  To export a
-divelog from Divemanager one needs to locate the DM4/DM5 database where the
-dives are stored. the user can either look for the original database or make
-a backup of the dives. Both methods are described here.
+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.
 
 Locating the Suunto DM4 (or DM5) database:
 
 1. Start Suunto DM4/DM5
 2. Select 'Help -> About'
 3. Click 'Copy' after text 'Copy log folder path to clipboard'
-4. Now open Windows Explorer
+4. Ouvrir l'explorateur Windows
 5. Paste the address to the path box at the top of the File Explorer
 6. The database is called DM4.db or DM5.db
 
@@ -4320,18 +4218,18 @@ directly imported to Subsurface.
 
 [icon="images/icons/mareslogo.jpg"]
 [NOTE]
-Mares Dive Organiser is a Windows application. The dive log is kept as a
+Mares Dive Organizer is a Windows application. The dive log is kept as a
 Microsoft SQL Compact Edition database with a '.sdf' filename extension. The
-database includes all Dive Organiser-registered divers on the particular
-computer and all Mares dive computers used. The safest way to obtain a copy
-of the dive database is to export the information to another compatible
-format which can be imported into _Subsurface_.
+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 then be imported into _Subsurface_.
 
-1. Within Dive Organiser, select _Database -> Backup_ from the main menu and
+1. Within Dive Organizer, select _Database -> Backup_ from the main menu and
    back up the database to the desk top.  This creates a zipped file
-   DiveOrganiserxxxxx.dbf.
-2. Rename the file to DiveOrganiserxxxxx.zip. Inside the zipped directory is a
-   file _DiveOrganiser.sdf_.
+   DiveOrganizerxxxxx.dbf.
+2. Rename the file to DiveOrganizerxxxxx.zip. Inside the zipped directory is a
+   file _DiveOrganizer.sdf_.
 3. Extract the _.sdf_ file from the zipped folder to your Desktop.
 4. The password for accessing the .zip file is _mares_.
 
@@ -4342,11 +4240,11 @@ format which can be imported into _Subsurface_.
 [NOTE]
 The best way to bring your logs from DivingLog to Subsurface is to convert
 the whole database. This is because other export formats do not include all
-the details, and we would lack e.g. gas switches and information of what
-units are used. With database import, all this information is included and
-readily available for us.
+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.
 
-To transfer all files from DivingLog to Subsurface, do the following:
+To transfer all files from DivingLog to Subsurface:
 
 1. In DivingLog open the 'File -> Export -> SQLite' menu
 2. Select 'Settings' button
@@ -4355,28 +4253,25 @@ To transfer all files from DivingLog to Subsurface, do the following:
 5. Click 'Export' button and select the filename
 
 Once this is done, open the saved database file with Subsurface and the
-dives are automatically converted to our own format. Last step to do is save
-the log file in Subsurface.
+dives are automatically converted to Subsurface’s own format. Last step to
+do is save the log file in Subsurface.
 
 == ANNEXE D : Exporter un tableur vers le format CSV
 [[S_Appendix_D]]
 
-De nombreux plongeurs conservent un carnet de plongée sous forme de fichier
-numérique, souvent un tableur avec différents champs et informations. Ces
-données peuvent facilement être importées dans _Subsurface_ après que le
-tableur a été converti en fichier CSV. Cette section explique la procedure
-pour convertir un carnet de plongée enregistrée sous forme de tableur vers
-un fichier CSV qui pourra ensuite être importé dans _Subsurface_. Créer un
-fichier CSV est une tache simple malgré que la procédure soit différente
-selon le tableur utilisé.
-
-La première étape est d'organiser les données de plongées dans le tableur
-pour que la première ligne contienne le nom (ou le titre) de chaque colonne
-et que les informations de chaque plongée soient contenues sur une seule
-ligne. _Subsurface_ supporte de nombreux éléments (Dive #, Date, Time,
-Duration, Location, GPS, Max Depth, Mean Depth, Buddy, Notes, Weight et
-Tags). L'utilisateur peut organiser les données de plongées selon quelques
-règles simples :
+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 _Subsurface_ 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 to
+_Subsurface_.  Creating a .CSV is straightforward, although the procedure is
+somewhat different according to which spreadsheet program is used.
+
+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.  _Subsurface_ supports many data items (Dive number, Date,
+Time, Duration, Location, GPS, Max Depth, Mean Depth, Buddy, Notes, Weight
+and Tags).  Organize dive data following a few simple rules:
 
 1. Date : utiliser un des formats suivants : aaaa-mm-jj, jj.mm.aaaa, mm/jj/aaaa
 2. Durée : le format est minutes:secondes.
@@ -4384,9 +4279,8 @@ règles simples :
    entre les unités impériales et métriques)
 4. Étiquettes et équipiers : les valeurs doivent être séparées par des
    virgules.
-5. Position GPS : vous devez utiliser les degrés décimaux, par exemple :
-   30.22496 30.821798
-
+5. Position GPS : utilisez les degrés décimaux, par exemple : 30.22496
+   30.821798
 === _LibreOffice Calc_ et _OpenOffice Calc_
 
 These are open source spreadsheet applications forming parts of larger open
@@ -4410,21 +4304,21 @@ then select _OK_.
 
 image::images/LOffice_field_options.jpg["FIGURE: Field options", align="center"]
 
-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
-xref:S_ImportingCSVDives[Importing CSV dives].
+Double check the .CSV file by opening it with a text editor, and then import
+the dive data as explained on the section xref:S_ImportingCSVDives[Importing
+CSV dives].
 
 === Microsoft _Excel_
 
 The field delimiter (called "_list separator_" in Microsoft manuals) is not
 accessible from within _Excel_ and needs to be set through the _Microsoft
 Control Panel_. After changing the separator character, all software on the
-Windows machine use the new character as a separator.  One can change 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.
 
-- In Microsoft Windows, click the *Start* button, and then select _Control
-  Panel_ from the list on the right-hand side.
+- In Microsoft Windows, click the *Start* button, then select _Control Panel_
+  from the list on the right-hand side.
 - Open the _Regional and Language Options_ dialog box.
 - Do one of the following: ** In Windows 7, click the _Formats_ tab, and then
   click _Customize this format_.  ** In Windows XP, click the _Regional
@@ -4447,75 +4341,73 @@ image::images/Win_SaveCSV1.jpg["FIGURE: Excel save as option", align="center"]
 Click on the left-hand part of the _Save as_ 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 _Save as Type:_, select _CSV(Comma delimited) (*.CSV)_. Ensure that
-the appropriate folder has been selected to save the CSV file into.
+marked _Save as Type:_, select _CSV(Comma delimited) (*.CSV)_. Be sure the
+appropriate folder has been selected to save the CSV file into.
 
 image::images/Win_SaveCSV3.jpg["FIGURE: Excel save CSV dialogue", align="center"]
 
 Select the _Save_ 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
+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
 xref:S_ImportingCSVDives[Importing CSV dives].
-
 [[S_APPENDIX_E]]
 == ANNEXE E : Créer un modèle d'impression personnalisé
 
-_Subsurface_ provides a mechanism to create or modify templates for printing
-dive logs in order to produce customised printouts of dive logs. Templates,
-written in HTML as well as a simple Grantlee instruction set, are rendered
-to the print device by _Subsurface_.
+_Subsurface_ 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
+_Subsurface_.
 
 Templates are accessed using the print dialogue (see image *B* below).
 
 image::images/Print1_f22.jpg["FIGURE: Print dialogue", align="center"]
 
-The buttons under the _Template_ dropdown box allows one to _Edit_,
-_Delete_, _Import_ and to _Export_ templates (see image *A* 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 *B* above). Choose an existing template that resembles the final
-desired printout. Then select _Edit_.
+The buttons under the _Template_ dropdown box lets you _Edit_, _Delete_,
+_Import_ and _Export_ templates (see image *A* 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
+*B* above). Choose an existing template that resembles the final desired
+printout. Then select _Edit_.
 
-The Edit Panel comprises three tabs:
+The Edit Panel has three tabs:
 
 image::images/Template1_f22.jpg["FIGURE: template edit dialogue", align="center"]
 
-1) The _Style_ tab (image *A* above) controls the font, line spacing and colour
+1) The _Style_ tab (image *A* 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 colour palets used for colour printing.
+   editable. Choose one of the four color palettes used for color printing.
 
-2) The _Colors_ tab (image *B* above) allows editing the colours used for
-   printing the dive log. The colours are highly customisable: the _Edit_
-   buttons in the _Colors_ tab allows choosing abritrary colours for different
+2) The _Colors_ tab (image *B* above) allows editing the colors used for
+   printing the dive log. The colors are highly customizable: the _Edit_
+   buttons in the _Colors_ tab allows choosing arbitrary colors for different
    components of the dive log printout.
 
 3) The _Template_ tab of the Edit Panel (see image below) allows creating a
    template using HTML as well as a few Grantlee programming
-   primitives. Grantlee provides the ability to create and format HTML code in
-   a highly simple but efficient way (see below). The HTML of the template can
-   be edited and saved. The saved template is stored in the same directory as
-   the dive being processed. By default, a _Custom_ 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: "<!--
+   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 _Custom_ 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: "<!--
    Template must be filled -->". Writing HTML code with Grantlee instructions
-   allows unlimited freedom in determining what is printed an in which way it
+   allows unlimited freedom in determining what is printed and in which way it
    should be rendered.
 
 image::images/Template2_f22.jpg["FIGURE:Template tab", align="center"]
 
-One can adapt any of the existing templates and save it to the dive log
+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 _Export_ button in
 the print dialogue to save the new template using a new template name.
 
-To write a custom template the following elements must exist so that the
+To write a custom template, the following elements must exist so the
 template will be correctly handled and rendered.
 
 === Main dive loop
-_Subsurface_ exports a dive list called (*dives*) to the _Grantlee_
-backend. It is possible to iterate over the list as follows:
-
+_Subsurface_ exports a dive list called (*dives*) to the _Grantlee_ back
+end. It is possible to iterate over the list as follows:
 .template.html
 ....
 	{% for dive in dives %}
@@ -4530,7 +4422,7 @@ backend. It is possible to iterate over the list as follows:
 	<h1> 3 </h1>
 ....
 
-Additional information about _Grantlee_ can be found
+Additional information about _Grantlee_ can be found at
 http://www.grantlee.org/apidox/for_themers.html[here]
 
 === Grantlee exported variables
@@ -4539,20 +4431,31 @@ Only a subset of the dive data is exported:
 |*Name*|*Description*
 |number| (*int*) dive number
 |id| (*int*) unique dive ID, should be used to fetch the dive profile
-|date| (*string*) data of the dive
+|date| (*string*) date of the dive
 |time| (*string*) time of the dive
 |location| (*string*) location of the dive
 |duration| (*string*) duration of the dive
 |depth| (*string*) depth of the dive
-|divemaster| (*string*) divemaster data
-|buddy| (*string*) buddy data
-|airTemp| (*string*) air temperature of dive
-|waterTemp| (*string*) water temperature of dive
+|divemaster| (*string*) dive master for the dive
+|buddy| (*string*) buddy for the dive
+|airTemp| (*string*) air temperature of the dive
+|waterTemp| (*string*) water temperature of the dive
 |notes| (*string*) dive notes
-|rating| (*int*) dive rating ranges from 0 to 5
-|sac| (*string*) sac value
-|tags| (*string*) all dive tags concatenate together
-|gas| (*string*) used gas cylinder
+|rating| (*int*) dive rating which ranges from 0 to 5
+|sac| (*string*) SAC value for the dive
+|tags| (*string*) list of dive tags for the dive
+|gas| (*string*) list of gases used in the dive
+|suit| (*string*) the suit used for the dive
+|cylinders| (*string*) complete information of all used cylinders
+|cylinder0-7| (*string*) information about a specific cylinder
+|weights| (*string*) complete information of all used weight systems
+|weight0-5| (*string*) information about a specific weight system
+|maxcns| (*string*) maxCNS value for the dive
+|otu| (*string*) OTU value for the dive
+|sumWeight| (*string*) the summed weight of all used weight systems
+|startPressure| (*string*) the start pressure
+|endPressure| (*string*) the end pressure
+|firstGas| (*string*) first used gas
 |=====================
 
 _Subsurface_ also exports *template_options* data. This data must be used as
@@ -4605,16 +4508,15 @@ contains a single member:
 ....
 
 === Defined CSS selectors
-
-As the dive profile is placed after rendering, _Subsurface_ uses a special
-_CSS_ selectors to do some searches in the HTML output. The _CSS_ selectors
-in the following table should be added.
+As the dive profile is placed after rendering, _Subsurface_ uses special
+_CSS_ selectors to searche in the HTML output. The _CSS_ selectors in the
+following table should be added.
 
 |====================
 |*Selector*|*Type*|*Description*
 |dive_{{ dive.id }} | id | is used to fetch the relevant dive profile
-|diveProfile | class | each div that will contain a dive profile should have this class selector in addition to the dive_{{ dive.id }} id selector
-|dontbreak | class | prevents the div with this class to be divided into two pages, this can be used
+|diveProfile | class | each dive that will contain a dive profile should have this class selector in addition to the dive_{{ dive.id }} id selector
+|dontbreak | class | 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)
 |=====================
 
@@ -4624,11 +4526,11 @@ data-numberofdives = 0).
 === Special attributes
 
 There are two ways of rendering- either rendering a specific number of dives
-in each page or make _Subsurface_ try to fit as much dives as possible into
+in each page or make _Subsurface_ try to fit as many dives as possible into
 one page (_flow_ rendering).
 
 The *data-numberofdives* data attribute is added to the body tag to set the
-rendering mode
+rendering mode.
 
 - render 6 dives per page:
 
@@ -4655,7 +4557,7 @@ calculates. Is _Subsurface_ miscalculating?
 
 'Answer': Not really. What happens is that _Subsurface_ actually calculates
 gas consumption differently - and better - than you expect.  In particular,
-it takes the incompressibility of the gas into account.  Traditionally, Gas
+it takes the incompressibility of the gas into account.  Traditionally, gas
 consumption and SAC should be: +consumption = tank size x (start pressure -
 end pressure)+
 
@@ -4708,20 +4610,18 @@ dive”.
 === Some dive profiles are missing from the download
 
 [[DC_HISTORY]]
-'Question': I cannot download all my dives, only the most recent ones even
+'Question': I cannot download all my dives, only the most recent ones, even
 though my dive computer's manual states that it records history of e.g. 999
-dives.
-
-'Answer': Dive history is different than the dive profiles on the log.  The
-history only keeps track of the total number of dives and total amount of
-time spent below surface. The logs, on the other hand, store the dive
-profile, but they have limited amount of memory to do so. The exact amount
-of dive profiles that can be stored on the device depend on sample interval
-and duration of the dives. Once the memory is full the oldest dives get
-overwritten with new dives. Thus we are only able to download the last 13,
-30 or 199 dives.
+dives? 'Answer': 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 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.
 
 If you have downloaded your dives to different dive logging software before
-they were overwritten, there is a high chance that Subsurface can import
+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.
+salvaged after being overwritten by new dives.