user manual: update dates and add latest HTML

Signed-off-by: Dirk Hohndel <dirk@hohndel.org>

2 files changed, 204 insertions, 500 deletions

diff --git a/Documentation/user-manual.html.git b/Documentation/user-manual.html.git
index c4b5f7a57..79b8e462f 100644
--- a/Documentation/user-manual.html.git
+++ b/Documentation/user-manual.html.git
@@ -446,7 +446,7 @@ asciidoc.install(3);
 <div class="paragraph"><p><strong>Manual authors</strong>: Willem Ferguson, Jacco van Koll, Dirk Hohndel, Reinout Hoornweg,
 Linus Torvalds, Miika Turkia, Amit Chaudhuri, Jan Schubert, Salvador Cuñat, Pedro Neves,
 Stefan Fuchs</p></div>
-<div class="paragraph"><p><span class="blue"><em>Version 4.7, May 2018</em></span></p></div>
+<div class="paragraph"><p><span class="blue"><em>Version 4.8, September 2018</em></span></p></div>
 <div class="paragraph"><p>Welcome as a user of <em>Subsurface</em>, an advanced dive logging program with
 extensive infrastructure to describe, organize, interpret and print scuba
 and free dives. <em>Subsurface</em> offers many advantages over other similar
@@ -1361,10 +1361,9 @@ dive site name in the <strong>Notes tab</strong>.</p></div>
 </div>
 <div class="paragraph"><p>Once the dive location data have been saved, the dive on the Dive List has
 a globe icon immediately to the left of the location name of a particular dive.</p></div>
-<div class="paragraph"><p><strong>(3):</strong> Obtain the coordinates using either the Subsurface-Mobile App or the <em>Subsurface</em> Companion App on an
+<div class="paragraph"><p><strong>(3):</strong> Obtain the coordinates using the <em>Subsurface-mobile</em> App on an
    Android or iPhone device with GPS and if the dive site coordinates
-   were stored using one of these apps.
-   <a href="#S_Companion">Click here for more information</a></p></div>
+   were stored using one of this app.</p></div>
 <div class="admonitionblock">
 <table><tr>
 <td class="icon">
@@ -2124,31 +2123,13 @@ a smaller file to make sure everything works.</td>
 This is performed by:</p></div>
 <div class="paragraph"><p>1) Taking the mobile device along on the dive boat / liveabord while
 automatically collecting dive site coordinate information.</p></div>
-<div class="paragraph"><p>2) Uploading the coordinates from the mobile device to the <em>Subsurface</em> Internet server.</p></div>
-<div class="paragraph"><p>3) Syncronising the dives in the <em>Subsurface</em> dive list with the coordinates stored
-on the <em>Subsurface</em> Internet server.</p></div>
-<div class="paragraph"><p><em>Subsurface</em> has two tools for achieving this:</p></div>
-<div class="ulist"><ul>
-<li>
-<p>
-The <em>Subsurface Companion App</em> (Android and iOS).
-</p>
-</li>
-<li>
-<p>
-The <em>Subsurface-mobile</em> app (Android and iOS)
-</p>
-</li>
-</ul></div>
-<div class="paragraph"><p>Both of these applications perform the collection of dive site coordinates and
-the synchronisation with dives in the <em>Subsurface</em> dive list. However, the Companion App
-is not being further developed and has largely been replaced by the <em>Subsurface-mobile</em>
-app. While the <em>Companion app</em> serves exclusively to collect dive site coordinates and
-to make these available to the <em>Subsurface</em> desktop version, <em>Subsurface-mobile</em> performs
-many of the functions of the desktop version, including the management and viewing of dive
-information. Below, we describe how to perform the above three steps using each of the two
-mobile apps.</p></div>
-<div class="paragraph"><p>For information on using the <em>Subsurface Companion App</em>, click <a href="#S_Companion"><em>here</em></a>.</p></div>
+<div class="paragraph"><p>2) Adding collected coordinate information to the dives using the <em>Subsurface-mobile</em> app.</p></div>
+<div class="paragraph"><p>3) Syncronising the logbook with the <em>Subsurface</em> cloud using the <em>Subsurface-mobile</em> app.</p></div>
+<div class="paragraph"><p>Existing users might still be using the legacy <em>Companion app</em>. However, the Companion App
+hasn&#8217;t been under development in several years and has now been removed from both Android
+and iOS app stores. The functionality is fully integrated into <em>Subsurface-mobile</em>.
+Please note that the old GPS fix internet service will be shut down by the end 2018 at which
+point the <em>Companion app</em> will no longer be usable. Please switch to <em>Subsurface-mobile</em> instead.</p></div>
 <div class="sect3">
 <h4 id="_storing_and_and_using_gps_locations_using_em_subsurface_mobile_em">5.4.1. Storing and and using GPS locations using  <em>Subsurface-mobile</em></h4>
 <div class="sect4">
@@ -2215,14 +2196,6 @@ of GPS positions.</p></div>
 <div class="sect4">
 <h5 id="_after_the_dive_stop_the_automated_recording_of_gps_locations">After the dive, stop the automated recording of GPS locations</h5>
 <div class="paragraph"><p>Select the menu option <em>Disable location service</em> at the bottom of the <em>Subsurface-mobile</em> GPS menu.</p></div>
-</div>
-<div class="sect4">
-<h5 id="_upload_the_gps_locations_onto_the_em_subsurface_em_internet_server">Upload the GPS locations onto the <em>Subsurface</em> Internet server.</h5>
-<div class="paragraph"><p><strong>N.B.:</strong> Uploading the GPS locations to the Internet can only take place if the mobile
-device has reliable access to the Internet, either via a cellular network or
-via a wifi connection. If the Internet is not accessible from the dive site(s),
-then GPS uploading can only take place after the dive or after the dive trip,
-when an Internet connection has been re-established.</p></div>
 <div class="paragraph"><p>From the <em>Subsurface-mobile</em> main menu, select <em>GPS</em>  &#8594; <em>Upload GPS data</em>. The
 locations are uploaded.</p></div>
 </div>
@@ -2241,387 +2214,39 @@ performing the collection of GPS data and for managing, uploading and
 synchronising this information.</p></div>
 </div>
 </div>
-<div class="sect3">
-<h4 id="S_Companion">5.4.2. Importing GPS coordinates with the <em>Subsurface Companion App</em> for mobile phones</h4>
-<div class="paragraph"><p>Using the <strong>Subsurface Companion App</strong> on an <em>Android device</em>   or
-<a href="#S_iphone"><em>iPhone</em></a> with GPS, the coordinates
-for the diving
-location can be automatically passed to the <em>Subsurface</em> dive log. The Companion App
-stores dive locations on a dedicated Internet server. <em>Subsurface</em> can collect
-the locations from the server.
-To do this:</p></div>
-<div class="sect4">
-<h5 id="_create_a_companion_app_account">Create a Companion App account</h5>
-<div class="ulist"><ul>
-<li>
-<p>
-Register on the <a href="http://api.hohndel.org/login/"><em>Subsurface companion web page</em></a>.
-  A confirmation email with instructions and a personal <strong>DIVERID</strong> will be sent,
-  a long number enabling access to the file server and Companion App capabilities.
-</p>
-</li>
-<li>
-<p>
-Download the app from
-  <a href="https://play.google.com/store/apps/details?id=org.subsurface">Google Play Store</a>
-  or from
-  <a href="https://f-droid.org/repository/browse/?fdfilter=subsurface&amp;fdid=org.subsurface">F-Droid</a>.
-</p>
-</li>
-</ul></div>
-</div>
-<div class="sect4">
-<h5 id="_using_the_subsurface_companion_app_on_an_android_smartphone">Using the Subsurface companion app on an Android smartphone</h5>
-<div class="paragraph"><p>On first use the app has three options:</p></div>
-<div class="ulist"><ul>
-<li>
-<p>
-<em>Create a new account.</em>  Equivalent to registering in the <em>Subsurface</em> companion
-  page using an Internet browser. You can request a <strong>DIVERID</strong> using this option,
-  but it’s supplied via email and followed up by interaction with the
-  <a href="http://api.hohndel.org/login/"><em>Subsurface companion web page</em></a> to
-  activate the account.
-</p>
-</li>
-<li>
-<p>
-<em>Retrieve an account.</em>  If you forget your <strong>DIVERID</strong> you will receive an email
-  to recover the ID string.
-</p>
-</li>
-<li>
-<p>
-<em>Use an existing account.</em> You are prompted for your <strong>DIVERID</strong>. The app saves
-  this <strong>DIVERID</strong> and doesn’t ask for it again unless you use the <em>Disconnect</em> menu
-  option (see below).
-</p>
-</li>
-</ul></div>
-<div class="admonitionblock">
-<table><tr>
-<td class="icon">
-<img src="images/icons/important.png" alt="Important" />
-</td>
-<td class="content">In the <em>Subsurface</em> main program, the <strong>DIVERID</strong> should also be entered on the
-Default Preferences
-panel, by selecting <em>File &#8594;  Preferences &#8594;  General</em> from the main menu
-in <em>Subsurface</em> itself.
-This helps synchronization between <em>Subsurface</em> and the Companion App.</td>
-</tr></table>
-</div>
-<div class="paragraph"><p><strong>Creating new dive locations</strong></p></div>
-<div class="paragraph"><p>Now you are ready to get a dive position and
-send it to the server. The Android
-display looks like the left hand image (<strong>A</strong>) below, but without any dives.</p></div>
-<div class="paragraph"><p>Touch the + icon at the top right to add a new dive site. A menu
-with 3 options shows:</p></div>
-<div class="ulist"><ul>
-<li>
-<p>
-Current: A prompt for a place name is shown (or a request to activate the GPS if it is turned
-  off), after which the current location is saved.
-</p>
-</li>
-<li>
-<p>
-Use Map: This option allows you to fix a position by searching a world map. A
-  world map is shown (see <strong>B</strong> below). Specify the desired position
-  with a <em>long press</em> 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 allowing you to enter the
-  name of the dive location and the date and time of the dive (see <strong>C</strong> below). In order to import this
-  dive location in <em>Subsurface</em>, set the time to agree with the time of
-  that dive on the dive computer.
-</p>
-</li>
-</ul></div>
-<div class="imageblock" style="text-align:center;">
-<div class="content">
-<img src="images/Companion_5.jpg" alt="FIGURE: Companion App, add location using map" />
-</div>
-</div>
-<div class="ulist"><ul>
-<li>
-<p>
-Import local GPX file: The Android device searches for .gpx files and located
-  archives will be shown. The selected .gpx file is opened and its
-  locations shown. Now select the appropriate locations, and select the check
-  symbol in the upper right to add them.
-</p>
-</li>
-</ul></div>
-<div class="paragraph"><p><strong>List of dive locations</strong></p></div>
-<div class="paragraph"><p>The main screen shows a list of dive locations, each with a name, date and
-time (see <strong>A</strong> below). Some locations may have an arrow-up icon over the selection box to the left
-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 (like  <em>Delete</em> or <em>Send</em>)
-are performed on several selected locations.</p></div>
-<div class="paragraph"><p>Dive locations in this list can be viewed in two ways: a list of locations or a
-map showing them. The display mode (List or Map) is changed by
-selecting <em>Dives</em> at the top left of the screen (see <strong>A</strong> below) and then selecting
-the display mode. The display mode can be changed either from the list
-of locations or from the map (see <strong>B</strong> below). Upon selecting a location (on the list
-or on the map), an editing
-panel opens (see <strong>C</strong> below) where the dive description or other details may be changed.</p></div>
-<div class="imageblock" style="text-align:center;">
-<div class="content">
-<img src="images/Companion_4.jpg" alt="FIGURE: Companion App, add location using map" />
-</div>
-</div>
-<div class="paragraph"><p>Upon selecting a dive (<strong>not</strong> selecting the check box), the
-name given to it, date/time and GPS coordinates are shown with two options at the top
-of the screen:</p></div>
-<div class="ulist"><ul>
-<li>
-<p>
-Edit (pencil):  Change the name of the dive location.
-</p>
-</li>
-<li>
-<p>
-Maps:  Display a map showing the dive location.
-After editing and saving a dive location (see <strong>C</strong> above),
-upload it to the web
-service, as explained below.
-</p>
-</li>
-</ul></div>
-<div class="paragraph"><p><strong>Uploading dive locations</strong></p></div>
-<div class="paragraph"><p>There are several ways to send locations to the server.
-The easiest is simply
-selecting the locations (See <strong>A</strong> below) and then touching the right arrow at the
-top right of the screen.</p></div>
-<div class="admonitionblock">
-<table><tr>
-<td class="icon">
-<img src="images/icons/important.png" alt="Important" />
-</td>
-<td class="content">Be careful! The trash icon on the right means exactly what it should;
-it deletes the selected dive location(s).</td>
-</tr></table>
-</div>
-<div class="imageblock" style="text-align:center;">
-<div class="content">
-<img src="images/Companion_1.jpg" alt="FIGURE: Screen shots (A-B) of companion app" />
-</div>
-</div>
-<div class="paragraph"><p>After a dive trip using the Companion App, all dive locations are ready to be
-downloaded to a <em>Subsurface</em> dive log (see below).</p></div>
-<div class="paragraph"><p><strong>Settings on the Companion App</strong></p></div>
-<div class="paragraph"><p>Selecting the <em>Settings</em> menu option results in the right hand image above (<strong>B</strong>).</p></div>
-<div class="paragraph"><p><em>Server and account</em></p></div>
-<div class="ulist"><ul>
-<li>
-<p>
-<em>Web-service URL.</em> This is predefined (<a href="http://api.hohndel.org/">http://api.hohndel.org/</a>)
-</p>
-</li>
-<li>
-<p>
-<em>User ID.</em> The DIVERID obtained by registering as described above. The easiest way to
-  get it is to copy and paste from the confirmation email or just type it in.
-</p>
-</li>
-</ul></div>
-<div class="paragraph"><p><em>Synchronisation</em></p></div>
-<div class="ulist"><ul>
-<li>
-<p>
-<em>Synchronize on startup</em>. If selected, dive locations in the Android device and those
-  on the web service synchronize each time the app is started.
-</p>
-</li>
-<li>
-<p>
-<em>Upload new dives.</em> If selected, each time the user adds a dive location it is
-  automatically sent to the server.
-</p>
-</li>
-</ul></div>
-<div class="paragraph"><p><em>Background service</em></p></div>
-<div class="paragraph"><p>Instead of entering an unique dive location, you can leave the service running
-in the background, allowing a continuous collection of GPS locations.</p></div>
-<div class="paragraph"><p>The settings below define the behavior of the service:</p></div>
-<div class="ulist"><ul>
-<li>
-<p>
-<em>Min duration.</em> In minutes. The app will try to get a location every X minutes
-  until stopped by the user.
-</p>
-</li>
-<li>
-<p>
-<em>Min distance.</em> In meters. Minimum distance between two locations.
-</p>
-</li>
-<li>
-<p>
-<em>Name template.</em> The name the app will use when saving the locations.
-</p>
-</li>
-</ul></div>
-<div class="admonitionblock">
-<table><tr>
-<td class="icon">
-<img src="images/icons/info.jpg" alt="Tip" />
-</td>
-<td class="content"><em>How does the background service work?</em> Assuming the diver sets 5 minutes and 50
-meters in the settings above, the app will start by recording a location at the current
-location, followed by another one at every 5 minutes <strong>or</strong> every time one moves 50 m
-from previous location.
-If subsequent locations are within a radius of 50 meters from the previous one,
-a new location is not saved. If the diver is not moving, only one location is saved.
-If the diver is moving, a trace of the route is obtained by saving a
-location every 50 meters.</td>
-</tr></table>
-</div>
-<div class="paragraph"><p><em>Other</em></p></div>
-<div class="ulist"><ul>
-<li>
-<p>
-<em>Mailing List.</em> The mail box for <em>Subsurface</em>. Users can send an email to the
-Subsurface mailing list.
-</p>
-</li>
-<li>
-<p>
-<em>Subsurface website.</em> A link to the URL of Subsurface web
-</p>
-</li>
-<li>
-<p>
-<em>Version.</em> Displays the current version of the Companion App.
-</p>
-</li>
-</ul></div>
-<div class="paragraph"><p><em>Search</em></p></div>
-<div class="paragraph"><p>Search the saved dive locations by name or by date and time.</p></div>
-<div class="paragraph"><p><em>Start service</em></p></div>
-<div class="paragraph"><p>Starts the <em>background service</em> following the previously defined settings.</p></div>
-<div class="paragraph"><p><em>Disconnect</em></p></div>
-<div class="paragraph"><p>This is admittedly a badly named option that disconnects the app from the server.
-It resets the user ID in the app, showing the first screen where an account
-can be created, retrieve the ID for an existing account or use the users own
-ID. The <em>Disconnect</em> option
-is useful if the Android device was used to download the dive locations
-of another registered diver.</p></div>
-<div class="paragraph"><p><em>Send all locations</em></p></div>
-<div class="paragraph"><p>This option sends all locations stored in the Android device to the server.</p></div>
-</div>
-<div class="sect4">
-<h5 id="S_iphone">Using the Subsurface companion app on an <em>iPhone</em> to record dive locations</h5>
-<div class="paragraph"><p>The iPhone interface is quite simple. Type the user ID (obtained
-during registration) into the space reserved for it, then select "Dive in"
-(see left part of the image below) and start collecting dive location information.</p></div>
-<div class="imageblock" style="text-align:center;">
-<div class="content">
-<img src="images/iphone.jpg" alt="FIGURE: Using iPhone companion application" width="640" />
-</div>
-</div>
-<div class="paragraph"><p>Dives can be added automatically or manually. In manual mode, a dive location or waypoint is added to the GPS input stream. In automatic
-mode, a continuous path of GPS locations is created from which,
-after import, Subsurface can select the appropriate GPS
-locations based on the times of dives. The default mode for the
-<em>iphone</em> is automatic. When adding a dive, the
-location service is started automatically and a red bar appears at the bottom
-of the screen. After the dive, click on the red
-bar to end the location service. While the location
-service is running you can only add dives manually.</p></div>
-<div class="paragraph"><p>You can edit the site name afterwards by selecting the dive
-from the dive list and clicking on the site name. There are no other
-editable fields. The dive list is automatically uploaded from the iPhone
-to the web service. There is no option to
-trigger upload manually.</p></div>
-<div class="paragraph"><p><strong>Downloading dive locations to the <em>Subsurface</em> divelog</strong></p></div>
-<div class="paragraph"><p>Download dive(s) from a dive computer or enter them manually into
-<em>Subsurface</em> before obtaining the GPS coordinates from the server. The download
-dialog can be reached via <em>Ctrl+G</em> or from the <em>Subsurface</em> Main Menu <em>Import
-&#8594; Import GPS data from Subsurface Service</em>, resulting in the image on the
-left (<strong>A</strong>), below. On first use the DIVERID text box is blank. Provide a
-DIVERID, then select the <em>Download</em> button to start the download process, after
-which the screen on the right (<strong>B</strong>) below appears:</p></div>
-<div class="imageblock" style="text-align:center;">
-<div class="content">
-<img src="images/DownloadGPS.jpg" alt="FIGURE: Downloading Companion app GPS data" />
-</div>
-</div>
-<div class="paragraph"><p>Note that the <em>Apply</em> button is now active: selecting it updates the locations
-of the newly entered or uploaded dives in <em>Subsurface</em>, i.e. it applies the
-coordinates and names entered on the app to all the new dives that match the
-date-times of the uploaded GPS localities. The names of dive
-locations entered within <em>Subsurface</em> (i.e. before downloading the GPS coordinates) have
-precedence over downloaded dive locations.</p></div>
-<div class="paragraph"><p>Since <em>Subsurface</em> matches GPS locations from the mobile device and dive information from the
-dive computer based on date-time data, automatic assignment of GPS data to dives depends
-on agreeing date-time information between the two devices. Although <em>Subsurface</em> has
-a wide range tolerance, it may not be able to identify the appropriate dive if there is a
-large difference between the time in the dive computer and that of the Android device.
-This results in no updates.</p></div>
-<div class="paragraph"><p>Similar date-times may not always be possible and there may be many reasons for this (e.g. time zones).
-<em>Subsurface</em> may also be unable to decide which is the correct position for a dive (e.g. on repetitive
-dives while running <em>background service</em> there may be several locations that would be
-included in the time range that fit not only the first dive, but one or more subsequent dives as well).
-A workaround to manually edit the date-time of a dive in the <em>Subsurface</em>
-Dive List <strong>before</strong> downloading the GPS data and then to change the date-time back again <strong>after</strong>
-downloading GPS data.</p></div>
-<div class="admonitionblock">
-<table><tr>
-<td class="icon">
-<img src="images/icons/info.jpg" alt="Note" />
-</td>
-<td class="content">TIPS:</td>
-</tr></table>
-</div>
-<div class="ulist"><ul>
-<li>
-<p>
-<em>Background service</em> may fill the location list with
-  unnecessary locations that don’t correspond to the exact dive point but do correspond to the boat&#8217;s route.
-   Right now, these locations are difficult to delete from the server. In some situations it
-  is better to clean up the list on the mobile device before sending the dive points to the web
-  server by simply deleting the inappropriate locations. This might be necessary, for
-  instance, to keep the location list clear to see dives in the web service map display (see above).
-</p>
-</li>
-<li>
-<p>
-It may also be useful to give informative names to the locations sent to the web server, or at least
-  to use an informative name in the <em>Name Template</em> setting while running the <em>background service</em>,
-  especially on a dive trip with many dives and dive locations.
-</p>
-</li>
-</ul></div>
-</div>
-</div>
 </div>
 <div class="sect2">
-<h3 id="S_LoadImage">5.5. Adding photographs to dives</h3>
-<div class="paragraph"><p>Many (if not most) divers take photographs
-during a dive. <em>Subsurface</em> allows the storage and display of photographs for each dive. Photos are
-superimposed on the dive profile at the times during the dive when they were taken. They can also be viewed
-from the dive profile.</p></div>
+<h3 id="S_LoadImage">5.5. Adding photographs or videos to dives</h3>
+<div class="paragraph"><p>Many (if not most) divers take photographs or videos
+during a dive. We term these as <em>media</em>, meaning either photos or videos. <em>Subsurface</em>
+allows the storage and display of these media for each dive. Images are
+superimposed on the dive profile at the times during the dive when they were taken. Media can be viewed either
+from the dive profile or from the <em>Media</em> tab in the <strong>Notes Panel</strong>. <em>Subsurface</em> allows viewing of photographs
+as well as video files in a unified interface.</p></div>
 <div class="sect3">
-<h4 id="_loading_photos_and_synchronizing_between_dive_computer_and_camera">5.5.1. Loading photos and synchronizing between dive computer and camera</h4>
+<h4 id="_loading_media_and_synchronizing_between_dive_computer_and_camera">5.5.1. Loading media and synchronizing between dive computer and camera</h4>
 <div class="paragraph"><p>Right-click on a dive or on a group of dives on the dive list, bringing up the <a href="#S_DiveListContextMenu">Dive list context Menu</a>.
-Select the appropriate option to import images either from
+Select the appropriate option to import media either from
 file or from the Internet. The system file browser appears. Select the folder and
-photographs that need to be loaded into <em>Subsurface</em> and click the <em>Open</em> button.</p></div>
+media that need to be loaded into <em>Subsurface</em> and click the <em>Open</em> button. Towards the
+bottom of the file browser is a filter that allows showing media (photos and videos),
+only photographs, only videos, or all files. Choose the appropriate option.</p></div>
 <div class="imageblock" style="text-align:center;">
 <div class="content">
 <img src="images/LoadImage2_f20.jpg" alt="FIGURE: Load images option" />
 </div>
 </div>
-<div class="paragraph"><p>If photos are imported from the Internet, provide a URL pointing to a single photograph.
-If the URL points to a directory, no images are imported: photos from the Internet
-need to be imported one at a time. If photos are loaded from the Internet, <em>Subsurface</em>
-assumes there is an Internet connection each time this photo is viewed within
+<div class="paragraph"><p>If media are imported from the Internet, provide a URL pointing to a single media.
+If the URL points to a directory, no images are imported: images from the Internet
+need to be imported one at a time. If media are loaded from the Internet, <em>Subsurface</em>
+assumes there is an Internet connection each time this item is viewed within
 <em>Subsurface</em>.</p></div>
-<div class="paragraph"><p>Having selected the local folder or Internet image to be imported, the time synchronization dialog appears (see image below). The time
+<div class="paragraph"><p>Having selected the local folder or Internet image to be imported, the time
+synchronization dialog appears (see image below). 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. <em>Subsurface</em> attempts to synchronize these two devices
-so that the exact times of photographs can be used to position photographs on
+often differ by several minutes. <em>Subsurface</em> attempts to synchronize them
+so that the exact times of media can be used to position media on
 the dive profile.</p></div>
 <div class="paragraph"><p><em>Subsurface</em> synchronizes camera with dive computer in three ways:</p></div>
 <div class="ulist"><ul>
@@ -2641,7 +2266,7 @@ the dive profile.</p></div>
   setting tool immediately under the heading <em>Shift times of image(s) by</em>, in the image 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 and select the <em>Earlier</em> radio button.
-  This is appropriate, since the photos need to be shifted
+  This is appropriate, since the media need to be shifted
   7 minutes earlier (camera is 7 minutes ahead of dive computer). Ignore any "AM" or "PM" suffix
   in that tool. Click the <em>OK</em> button and synchronization is done.
 </p>
@@ -2678,23 +2303,53 @@ the dive profile.</p></div>
 <img src="images/LoadImage3c_f23.jpg" alt="FIGURE: Synchronization dialog" />
 </div>
 </div>
-<div class="paragraph"><p>If the timestamp of a photograph is more than 30 minutes before or after the dive, it is not placed on
-the dive profile (see the red warning in the image above). However, If the appropriate checkbox is selected (see image above) these images can still be placed on the <em>Photos</em> tab of the <strong>Notes</strong> panel so that all photos associated with a dive are visible, including photos taken before or after the dive.</p></div>
+<div class="paragraph"><p>If the timestamp of a photograph or video is more than 30 minutes before or after the dive, it is not placed on
+the dive profile (see the red warning in the image above). However, If the appropriate checkbox is
+selected (see image above) these images can still be placed on the <em>Media</em> tab of the <strong>Notes</strong> panel
+so that all media associated with a dive are visible, including images taken before or after the dive.</p></div>
 </div>
 <div class="sect3">
-<h4 id="_viewing_the_photos">5.5.2. Viewing the photos</h4>
-<div class="paragraph"><p>After the images have been loaded, they appear in two places:</p></div>
+<h4 id="S_ViewMedia">5.5.2. Viewing the media</h4>
+<div class="sidebarblock">
+<div class="content">
+<div class="paragraph"><p><strong>Ensuring that thumbnails are created for video files</strong></p></div>
+<div class="admonitionblock">
+<table><tr>
+<td class="icon">
+<img src="images/icons/important.png" alt="Important" />
+</td>
+<td class="content">Within a panel <em>Subsurface</em> represents media by means of thumbnails (i.e. small versions of images
+that allows listing many images. For a photograph, a thumbnail can easily be
+created because the image is well defined. But, since a video comprises many images, the question arises of
+which image should be used for the thumbnail. Two actions are required to create thumbnails of videos:</td>
+</tr></table>
+</div>
+<div class="ulist"><ul>
+<li>
+<p>
+The appropriate settings need to be set in the <em>Preferences</em>.
+</p>
+</li>
+<li>
+<p>
+The program <em>ffmpeg</em> needs to be installed in the computer that runs Subsurface.
+</p>
+</li>
+</ul></div>
+<div class="paragraph"><p>Full details are provided in <a href="#S_APPENDIX_F">APPENDIX F</a>.</p></div>
+</div></div>
+<div class="paragraph"><p>After the media have been loaded, they appear in two places:</p></div>
 <div class="ulist"><ul>
 <li>
 <p>
-the <em>Photos</em> tab of the <strong>Notes</strong> panel (left part of image below).
+the <em>Media</em> tab of the <strong>Notes Panel</strong> (left part of image below).
 </p>
 </li>
 <li>
 <p>
 as tiny icons (stubs) on the dive profile at the appropriate positions reflecting the time
-   each photograph was taken.
-   To view the photos on the dive profile, activate the <em>show-photos</em> button in the tool bar
+   each photograph or video was taken.
+   To view the media on the dive profile, activate the <em>Toggle media</em> button in the tool bar
    to the left of the dive profile:
 </p>
 </li>
@@ -2707,23 +2362,23 @@ as tiny icons (stubs) on the dive profile at the appropriate positions reflectin
 <div class="paragraph"><p>This results in a profile display as in the image below:</p></div>
 <div class="imageblock" style="text-align:center;">
 <div class="content">
-<img src="images/LoadImage4_f20.jpg" alt="FIGURE: Photos on dive profile" />
+<img src="images/LoadImage4.jpg" alt="FIGURE: Photos on dive profile" />
 </div>
 </div>
-<div class="paragraph"><p>Hover the mouse over any of the photo stubs. A thumbnail photo
-is shown of the appropriate photo. See the image below:</p></div>
+<div class="paragraph"><p>Hover the mouse over any of the media stubs. A thumbnail image
+is shown of the appropriate media. See the image below:</p></div>
 <div class="imageblock" style="text-align:center;">
 <div class="content">
-<img src="images/LoadImage5_f20.jpg" alt="FIGURE:Thumbnail photo on dive profile" />
+<img src="images/LoadImage5.jpg" alt="FIGURE:Thumbnail photo on dive profile" />
 </div>
 </div>
 <div class="paragraph"><p>Clicking on the thumbnail brings up a full size
-photo overlaid on the <em>Subsurface</em> window, allowing a good view of
-the photographs (see the image below). <strong>Note</strong> that the thumbnail
+photo or video overlaid on the <em>Subsurface</em> window, allowing a good view of
+the media (see the image below). <strong>Note</strong> that the thumbnail on the dive profile
 has a small dustbin icon in the bottom right hand corner (see image above). Selecting
 the dustbin removes the image from the dive. Be careful
 when clicking on a thumbnail. Images
-can also be deleted using the <em>Photos</em> tab (see text below).</p></div>
+can also be deleted using the <em>Media</em> tab (see text below).</p></div>
 <div class="imageblock" style="text-align:center;">
 <div class="content">
 <img src="images/LoadImage6_f20.jpg" alt="FIGURE: Full-screen photo on dive profile" />
@@ -2731,54 +2386,53 @@ can also be deleted using the <em>Photos</em> tab (see text below).</p></div>
 </div>
 </div>
 <div class="sect3">
-<h4 id="_the_em_photos_em_tab">5.5.3. The <em>Photos</em> tab</h4>
-<div class="paragraph"><p>Photographs associated with a dive are shown as thumbnails in the <em>Photos</em> tab of the <em>Notes</em>
-panel. Photos taken in rapid succession during a dive (therefore sometimes with large
-overlap on the dive profile) can easily be accessed in the <em>Photos</em> tab. This tab serves as
-a tool for individually accessing the photos of a dive, while the stubs on the dive profile
-show when during a dive a photo was taken. The size of the thumbnails in the <em>Photos</em> tab can be changed using
+<h4 id="_the_em_media_em_tab">5.5.3. The <em>Media</em> tab</h4>
+<div class="paragraph"><p>Media associated with a dive are shown as thumbnails in the <em>Media</em> tab of the <strong>Notes
+Panel</strong>. Media taken in rapid succession during a dive (therefore sometimes with large
+overlap on the dive profile) can easily be accessed in the <em>Media</em> tab. This tab serves as
+a tool for individually accessing the media of a dive, while the stubs on the dive profile
+show when during a dive when a photo/video was taken. The size of the thumbnails in the <em>Media</em> tab can be changed using
 the <em>Zoom level</em> slider at the bottom of the panel. Single-click a thumbnail in
-the <em>Photos</em> panel to select a photo. Double-click a thumbnail to view the full-sized image,
-overlaying the <em>Subsurface</em> window. Delete a photo from the <em>Photos</em> panel by selecting
-it (single-click) and then by pressing the <em>Del</em> key on the keyboard. This removes the photo BOTH
-from the <em>Photos</em> tab as well as the dive profile.</p></div>
+the <em>Media</em> panel to select a photo/video. Double-click a thumbnail to view the full-sized image
+or play the video, overlaying the <em>Subsurface</em> window. Delete media from the <em>Media</em> panel by selecting
+it (single-click) and then by pressing the <em>Del</em> key on the keyboard. This removes it BOTH
+from the <em>Media</em> tab as well as the dive profile.</p></div>
 </div>
 <div class="sect3">
-<h4 id="_photos_on_an_external_hard_disk">5.5.4. Photos on an external hard disk</h4>
-<div class="paragraph"><p>Most underwater photographers store photos on an external drive. If such a drive can be mapped by the operating system
-(almost always the case) the photos can be directly accessed by <em>Subsurface</em>. This eases the interaction
-between <em>Subsurface</em> and an external repository of photos. When associating a dive profile with photos from an
+<h4 id="_media_on_an_external_hard_disk">5.5.4. Media on an external hard disk</h4>
+<div class="paragraph"><p>Most underwater photographers store media on an external drive. If such a drive can be mapped by the operating system
+(almost always the case) the media can be directly accessed by <em>Subsurface</em>. This eases the interaction
+between <em>Subsurface</em> and an external repository of media. When associating a dive profile with media from an
 external drive, the normal procedure of selection and synchronization (see text above) is used.
-After the external drive has been disconnected, <em>Subsurface</em> cannot access these photos any more.
-If the display of photos is activated (using the toolbox icon to the left of the <em>Dive Profile</em>), the
-program shows a small white dot where each photo should be on the dive profile.
-In addition the <em>Photos</em> tab shows only the file names of the photos.
-If the external drive with the photos is re-connected, the photos can be seen in the normal way.</p></div>
+After the external drive has been disconnected, <em>Subsurface</em> cannot access these media any more.
+If the display of media is activated (using the toolbox icon to the left of the <em>Dive Profile</em>), the
+program shows only the thumbnails and the images cannot be viewed at full-screen size.
+If the external drive with the media is re-connected, the media can be seen in the normal way.</p></div>
 </div>
 <div class="sect3">
-<h4 id="_finding_out_which_dives_have_associated_photos">5.5.5. Finding out which dives have associated photos.</h4>
-<div class="paragraph"><p>Inspecting each individual dive in order to determine whether there are associated photos can be time consuming. There is a
-rapid way of seeing which dives have associated photos and which not: activate the <em>Photos</em> checkbox in the dropdown
-list obtained by right-clicking on the header bar of the <strong>Divelist</strong>. In the <strong>Divelist</strong>, all dives with associated photographs
-have an icon indicating whether the photographs were taken during the dive, just before/after the dive or both during and before/after the dive.
+<h4 id="_finding_out_which_dives_have_associated_media">5.5.5. Finding out which dives have associated media.</h4>
+<div class="paragraph"><p>Inspecting each individual dive in order to determine whether there are associated media can be time consuming. There is a
+rapid way of seeing which dives have associated media and which not: activate the <em>Media</em> checkbox in the dropdown
+list obtained by right-clicking on the header bar of the <strong>Divelist</strong>. In the <strong>Divelist</strong>, all dives with associated media
+have an icon indicating whether the media were taken during the dive, just before/after the dive or both during and before/after the dive.
 More information is provided in the section dealing with <a href="#S_Divelist_columns">photo icons on the <strong>Divelist</strong></a>.</p></div>
 </div>
 <div class="sect3">
-<h4 id="S_FindMovedImages">5.5.6. Moving photographs among directories, hard disks or computers</h4>
-<div class="paragraph"><p>After a photograph has been loaded into <em>Subsurface</em> and associated with a specific dive,
-<em>Subsurface</em> saves the directory path where the photo lies as well as the file name of the photo,
+<h4 id="S_FindMovedImages">5.5.6. Moving media among directories, hard disks or computers</h4>
+<div class="paragraph"><p>After a photograph or video has been loaded into <em>Subsurface</em> and associated with a specific dive,
+<em>Subsurface</em> saves the path to the directory where the media lie as well as the file name of the each photo/video,
 in order to find it when the dive is opened again.
-If the photo or the whole photo collection is moved to another drive or to a different
- machine, the path to the photo changes. Now, <em>Subsurface</em> looks for the photos at their original location before they were moved,
- cannot find them and cannot display them. Because, after moving photos, large numbers of photos
- may need to be deleted and re-imported from the new location, <em>Subsurface</em> can locate the photos based on their filename and path.</p></div>
+If the media or the whole media collection is moved to another drive or to a different
+ machine, the path to the media changes. Now, <em>Subsurface</em> looks for the photos/videos at their original location before they were moved,
+cannot find them and cannot display them. Because, after moving media, large numbers of files
+ may need to be deleted and re-imported from the new disk, <em>Subsurface</em> can locate the media based on their filename and path.</p></div>
 <div class="paragraph"><p>This is done by selecting from the Main Menu: <em>File &#8594;      Find moved images</em>. This brings up a window within
 which the searching of the images can be controlled. The search is started by clicking on <em>Select folder and scan</em>.
-Since photos taken with different cameras might have the same filename, the names of the parent folders are likewise compared.
+Since recorded during different dive trips might have the same filename, the names of the parent folders are likewise compared.
 Therefore, the root folder of the NEW picture collection should be chosen. For finer control, it is possible to search
-only for photographs of the currently selected dive(s) by selecting the appropriate option.</p></div>
-<div class="paragraph"><p>After the searching has finished, the original filenames and the new locations of the photographs will be shown.
-The matching parts of the paths are emphasized. Photographs that are found at their known positions are
+only for media of the currently selected dive(s) by selecting the appropriate option.</p></div>
+<div class="paragraph"><p>After the searching has completed, the original filenames and the new locations of the photographs will be shown.
+The matching parts of the paths are emphasized. Media that are found at their known positions are
 not listed. The proposed changes can be applied by clicking <em>Apply</em> or rejected by clicking <em>Cancel</em>.</p></div>
 <div class="imageblock" style="text-align:center;">
 <div class="content">
@@ -3647,11 +3301,13 @@ two red dots.</td>
 <td class="icon">
 <img src="images/icons/ShowPhotos.png" alt="Note" />
 </td>
-<td class="content">Photographs that have been added to a dive can be shown on the profile
+<td class="content">Photographs and videos that have been added to a dive can be shown on the profile
 by selecting
-the <strong>Show-photo</strong> button. The position of a photo on the profile
-shows the exact time when this photo was taken. If this button is not active,
-the photos are hidden.</td>
+the <strong>Show-media</strong> button. The position of a photo on the profile
+shows the exact time when this photo was taken.
+The runtime of videos is represented by a bar if <em>Subsurface</em> was able to
+extract this information from the video file.
+If this button is not active, the photos are hidden.</td>
 </tr></table>
 </div>
 <div class="paragraph"><p>The profile can also include the dive computer reported <strong>ceiling</strong> (more
@@ -3903,14 +3559,14 @@ header bar of the <strong>Dive List</strong>, bringing up a list of columns
 that can be shown in the dive list (see above). Check an items to be included in the <strong>Dive List</strong>.
 The list is immediately updated. Preferences for information
 shown in the <strong>Dive List</strong> are saved and used when <em>Subsurface</em> is re-opened.</p></div>
-<div class="paragraph" id="S_Photos_divelist"><p>By selecting the <em>Photos</em> checkbox in the dropdown list, an icon is shown indicating whether any photos
+<div class="paragraph" id="S_Photos_divelist"><p>By selecting the <em>Media</em> checkbox in the dropdown list, an icon is shown indicating whether any media
 are associated with a particular dive. There are three icons:</p></div>
 <div class="admonitionblock">
 <table><tr>
 <td class="icon">
 <img src="images/icons/duringPhoto.png" alt="Note" />
 </td>
-<td class="content">This dive has photographs taken during the dive, typically using an underwater camera.</td>
+<td class="content">This dive has photographs or videos taken during the dive, typically using an underwater camera.</td>
 </tr></table>
 </div>
 <div class="admonitionblock">
@@ -3918,8 +3574,8 @@ are associated with a particular dive. There are three icons:</p></div>
 <td class="icon">
 <img src="images/icons/outsidePhoto.png" alt="Note" />
 </td>
-<td class="content">This dive has photographs taken immediately before or immediately after the dive. This is useful for
-finding photos of dive teams or boats just before/after the dive, whales or other surface animals seen
+<td class="content">This dive has photographs or videos taken immediately before or immediately after the dive. This is useful for
+finding photos/media of dive teams or boats just before/after the dive, whales or other surface animals seen
 just before or after the dive, or of landscapes as seen from the boat.</td>
 </tr></table>
 </div>
@@ -3928,7 +3584,7 @@ just before or after the dive, or of landscapes as seen from the boat.</td>
 <td class="icon">
 <img src="images/icons/inAndOutPhoto.png" alt="Note" />
 </td>
-<td class="content">This dive has photographs taken both during the dive and immediately before or after the dive.</td>
+<td class="content">This dive has photographs or videos taken both during the dive and immediately before or after the dive.</td>
 </tr></table>
 </div>
 </div>
@@ -4073,11 +3729,11 @@ dive at points during the dive where the depth is less than a metre.</p></div>
 </div>
 <div class="sect3">
 <h4 id="_load_image_s_from_file_s">7.4.7. Load image(s) from file(s)</h4>
-<div class="paragraph"><p>This topic is discussed in the section: <a href="#S_LoadImage">Adding photographs to dives</a>.</p></div>
+<div class="paragraph"><p>This topic is discussed in the section: <a href="#S_LoadImage">Adding photographs or videos to dives</a>.</p></div>
 </div>
 <div class="sect3">
 <h4 id="_load_image_from_web">7.4.8. Load image from web</h4>
-<div class="paragraph"><p>This topic is discussed in the section: <a href="#S_LoadImage">Adding photographs to dives</a>.</p></div>
+<div class="paragraph"><p>This topic is discussed in the section: <a href="#S_LoadImage">Adding photographs or videos to dives</a>.</p></div>
 </div>
 <div class="sect3">
 <h4 id="_undo_dive_manipulations">7.4.9. Undo dive manipulations</h4>
@@ -4282,9 +3938,9 @@ Universal Dive Data Format (<em>UDDF</em>). Refer to <em>http://uddf.org</em> fo
 <li>
 <p>
 <em>Image depths</em>, which creates a text file that contains the file names of all
-  photos or images attached
+  photos or videos attached
   to any of the selected dives in the <em>Dive List</em>, together with the depth underwater where
-  of each of those photos was taken.
+  of each of those photos/videos was taken.
 </p>
 </li>
 <li>
@@ -4709,7 +4365,7 @@ apply the new preferences, select <em>Cancel</em>.</p></div>
 <div class="paragraph"><p>There are several headings in the <strong>General</strong> panel:</p></div>
 <div class="imageblock" style="text-align:center;">
 <div class="content">
-<img src="images/Pref1_f23.jpg" alt="FIGURE: Preferences general page" />
+<img src="images/Pref1.jpg" alt="FIGURE: Preferences general page" />
 </div>
 </div>
 <div class="ulist"><ul>
@@ -4772,6 +4428,15 @@ apply the new preferences, select <em>Cancel</em>.</p></div>
 </li>
 <li>
 <p>
+<strong>Video thumbnails</strong>: In generating thumbnails for videos associated with dives, <em>Subsurface</em>
+     needs to have the appropriate information (see section on <a href="#S_ViewMedia">View Images</a>). Three preferences need to be set
+     as explained in <a href="#S_APPENDIX_F">APPENDIX F</a>. These are: a) switch on thumbnails, b) specify
+     the location of the <em>ffmpeg</em> program and c) set the place within video where the thumbnail needs
+     to be obtained from.
+</p>
+</li>
+<li>
+<p>
 <strong>Clear all settings</strong>: As indicated in the button below this heading, all settings are
      cleared and set to default values.
 </p>
@@ -4986,7 +4651,7 @@ effect</strong>.</p></div>
 <h3 id="_network">13.5. Network</h3>
 <div class="paragraph"><p>This panel facilitates communication between <em>Subsurface</em> and data sources on the Internet.
 This is important, for instance, when <em>Subsurface</em> needs to communicate with web
-services such as Cloud storage, the <a href="#S_Companion"><em>Subsurface Companion app</em></a> or when you want to communicate through a proxy.</p></div>
+services such as Cloud storage, or when you want to communicate through a proxy.</p></div>
 <div class="imageblock" style="text-align:center;">
 <div class="content">
 <img src="images/Pref5_f23.jpg" alt="FIGURE: Preferences Network page" />
@@ -5027,20 +4692,13 @@ from your ISP.
 </li>
 </ul></div>
 </li>
-<li>
-<p>
-<em>Subsurface web service</em>: When you subscribe to the <a href="#S_Companion">Subsurface web service</a>, a very
-     long and hard-to-remember userID is issued. This is the place to save that userID. By
-     checking the option <em>Save User ID locally?</em>, you ensure a local copy of that userID is saved.
-</p>
-</li>
 </ul></div>
 </div>
 <div class="sect2">
 <h3 id="_georeference">13.6. Georeference</h3>
 <div class="paragraph"><p><em>Subsurface</em> provides a geo-lookup service (that is, given the coordinates of a dive site) derived from
 a click on the <strong>Dive Map panel</strong> at the bottom right of the <em>Subsurface</em> window, or from a GPS instrument or
-from the <em>Subsurface</em> Companion app). A search on the Internet is done to find
+from the <em>Subsurface-Mobile</em> app). A search on the Internet is done to find
 the name of the closest known location. This function only works if <em>Subsurface</em> has an
 Internet connection. The preference of the dive site name can be configured, e.g. <em>Country/State/City</em>
 or <em>City/State/Country</em> (see image below).</p></div>
@@ -5940,7 +5598,7 @@ dealing with the appropriate operations.</p></div>
 </li>
 <li>
 <p>
-<em>Take cloud storage online</em> - <strong><strong></strong></strong><strong><strong></strong></strong><strong><strong></strong></strong><strong><strong></strong></strong><strong><strong></strong></strong><strong><strong></strong></strong><strong><strong></strong></strong><strong><strong></strong></strong><strong><strong></strong></strong>
+<em>Cloud storage online</em> - Switch between the online version of the logbook,  and the locally stored one.
 </p>
 </li>
 <li>
@@ -5966,7 +5624,7 @@ dealing with the appropriate operations.</p></div>
 </li>
 <li>
 <p>
-<a href="#S_FindMovedImages"><em>Find moved images</em></a> - If photos taken during dives have been moved to
+<a href="#S_FindMovedImages"><em>Find moved images</em></a> - If photos/videos taken during dives have been moved to
       a different disk or directory, locate them and link them to the appropriate dives.
 </p>
 </li>
@@ -6009,12 +5667,6 @@ The Edit option allows one to undo or redo an action, e.g. deleting dives.
 </li>
 <li>
 <p>
-<a href="#S_Companion"><em>Import GPS data from Subsurface web service</em></a> - Load GPS
-  coordinates from the <em>Subsurface</em> mobile phone app.
-</p>
-</li>
-<li>
-<p>
 <a href="#S_ImportingDivelogsDe"><em>Import from Divelogs.de</em></a> - Import dive information
   from <em>www.Divelogs.de</em>.
 </p>
@@ -6031,11 +5683,6 @@ The Edit option allows one to undo or redo an action, e.g. deleting dives.
 </li>
 <li>
 <p>
-<em>Edit dive</em> - Edit a dive where the profile was entered by hand and not from a dive computer.
-</p>
-</li>
-<li>
-<p>
 <a href="#S_DivePlanner"><em>Plan Dive</em></a> - Plan  dives.
 </p>
 </li>
@@ -7654,10 +7301,67 @@ render as much dives as possible:
 </div>
 </div>
 <div class="sect1">
-<h2 id="_appendix_f_faqs">22. APPENDIX F: FAQs.</h2>
+<h2 id="S_APPENDIX_F">22. APPENDIX F: Setting up video thumbnails.</h2>
+<div class="sectionbody">
+<div class="sect2">
+<h3 id="_setting_up_the_appropriate_thumbnails_for_videos_that_are_associated_with_dives">22.1. Setting up the appropriate thumbnails for videos that are associated with dives.</h3>
+<div class="paragraph"><p>In handling video associated with dives, <em>Subsurface</em> needs to create a thumbnail for each video that can be shown
+either on the dive profile or in the <em>Media</em> tab. By default this is a nonspecific placeholder thumbnail.
+To see thumbnails that represent individual videos, <em>Subsurface</em> uses an external program calle <em>FFmpeg</em>.
+To create thumbnails for videos, do two things:</p></div>
+<div class="olist arabic"><ol class="arabic">
+<li>
+<p>
+Install <em>FFmpeg</em> on the computer that runs <em>Subsurface</em>. The program can be downloaded from the FFmpeg web site:
+<a href="https://www.ffmpeg.org/download.html">https://www.ffmpeg.org/download.html</a>. Most Linux distributions ship with an <em>ffmpeg</em> package and therefore do not need an additional download.
+</p>
+<div class="ulist"><ul>
+<li>
+<p>
+On Windows, put the <em>ffmpeg.exe</em> file in the directory containing the <em>Subsurface</em> executable.
+On Mac and Linux, make sure the <em>ffmpeg</em> command is in the path. This should be the case for
+<em>FFmpeg</em> installed from official packages.
+</p>
+</li>
+</ul></div>
+</li>
+<li>
+<p>
+In the <em>General</em> tab of the <a href="#S_Preferences"><em>Preferences</em></a>, set the preferences for generating video thumbnails. This is achieved by:
+</p>
+<div class="ulist"><ul>
+<li>
+<p>
+Checking the <em>Extract video thumbnails</em> box. If <em>Subsurface</em> fails to load the <em>FFmpeg</em> executable,
+this option will be turned off. Re-enable it after successfully installing <em>FFmpeg</em>.
+</p>
+</li>
+<li>
+<p>
+Specifying the path to the <em>FFmpeg</em> executable.
+</p>
+</li>
+<li>
+<p>
+Choose the position in the video where <em>Subsurface</em>
+should try to extract the thumbnail. The left-most and right-most positions of the <em>Extract at position</em>
+slider signify the beginning and the end of the video, respectively. Note that if <em>Subsurface</em> cannot
+determine the length of the video (this can be the case for AVI files), the first frame
+of the video will be used.
+</p>
+</li>
+</ul></div>
+</li>
+</ol></div>
+<div class="paragraph"><p>This should complete the setup of video thumbnails and they should now appear on the dive profile and in the <em>Media</em> tab.</p></div>
+</div>
+</div>
+</div>
+<div class="sect1">
+<h2 id="_appendix_g_faqs">23. APPENDIX G: FAQs.</h2>
 <div class="sectionbody">
 <div class="sect2">
-<h3 id="S_APPENDIX_F">22.1. Subsurface appears to miscalculate gas consumption and SAC</h3>
+<h3 id="S_APPENDIX_G">23.1. Subsurface appears to miscalculate gas consumption and SAC</h3>
 <div class="paragraph" id="SAC_CALCULATION"><p><em>Question</em>: I dived with a 12.2 l tank, starting with 220 bar and ending with 100 bar, and I calculate a different SAC compared what <em>Subsurface</em> calculates. Is <em>Subsurface</em>
 miscalculating?</p></div>
 <div class="paragraph"><p><em>Answer</em>: Not really. What happens is that <em>Subsurface</em> actually calculates gas
@@ -7688,7 +7392,7 @@ starts becoming much more noticeable at high pressure. A 400 bar really does not
 contain twice as much air as a 200 bar one. At lower pressures, air acts pretty much like an ideal gas.</p></div>
 </div>
 <div class="sect2">
-<h3 id="_some_dive_profiles_have_time_discrepancies_with_the_recorded_samples_from_my_dive_computer_8230">22.2. Some dive profiles have time discrepancies with the recorded samples from my dive computer&#8230;</h3>
+<h3 id="_some_dive_profiles_have_time_discrepancies_with_the_recorded_samples_from_my_dive_computer_8230">23.2. Some dive profiles have time discrepancies with the recorded samples from my dive computer&#8230;</h3>
 <div class="paragraph"><p><em>Subsurface</em> ends up ignoring surface time for many things (average depth, divetime, SAC, etc).
 <em>Question</em>:  Why do dive durations in my dive computer differ from that given by <em>Subsurface</em>?</p></div>
 <div class="paragraph"><p><em>Answer</em>: For example, if you end up doing a weight check (deep enough to trigger the "dive started")
@@ -7700,7 +7404,7 @@ you may stay in the water for a long time, but spend most of it at the surface.
 you don&#8217;t want that to count as some kind of long dive”.</p></div>
 </div>
 <div class="sect2">
-<h3 id="_some_dive_profiles_are_missing_from_the_download">22.3. Some dive profiles are missing from the download</h3>
+<h3 id="_some_dive_profiles_are_missing_from_the_download">23.3. Some dive profiles are missing from the download</h3>
 <div class="paragraph" id="DC_HISTORY"><p><em>Question</em>: I cannot download all my dives, only the most recent ones,
 even though my dive computer&#8217;s manual states that it records history of
 e.g. 999 dives?
@@ -7724,7 +7428,7 @@ cannot be salvaged after being overwritten by new dives.</p></div>
 <div id="footer">
 <div id="footer-text">
 Last updated
- 2018-09-15 09:39:06 PDT
+ 2018-09-16 07:58:15 PDT
 </div>
 </div>
 </body>
diff --git a/Documentation/user-manual.txt b/Documentation/user-manual.txt
index 60c11ffcf..788324447 100644
--- a/Documentation/user-manual.txt
+++ b/Documentation/user-manual.txt
@@ -1,10 +1,10 @@
-// Subsurface 4.5 User Manual
+// Subsurface 4.8 User Manual
 // ==========================
 // :author: Manual authors: Jacco van Koll, Dirk Hohndel, Reinout Hoornweg,
 // Linus Torvalds, Miika Turkia, Amit Chaudhuri, Jan Schubert, Willem
 // Ferguson, Salvador Cuñat, Pedro Neves
-// :revnumber: 4.7
-// :revdate:October 2017
+// :revnumber: 4.8.2
+// :revdate:September 2018
 :icons:
 :toc2:
 :toc-placement: manual
@@ -19,7 +19,7 @@ image::images/Subsurface4Banner.jpg["Banner",align="center"]
 Linus Torvalds, Miika Turkia, Amit Chaudhuri, Jan Schubert, Salvador Cuñat, Pedro Neves,
 Stefan Fuchs
 
-[blue]#_Version 4.7, May 2018_#
+[blue]#_Version 4.8, September 2018_#
 
 Welcome as a user of _Subsurface_, an advanced dive logging program with
 extensive infrastructure to describe, organize, interpret and print scuba