Here is a diff of user-manual.html generated by me and the one provided by you. There is clear difference in them. Now the question is, what is different in our environments / git trees.
miika
--- Documentation/user-manual.html 2015-10-27 19:40:04.125715029 +0200 +++ /home/mturkia/Downloads/user-manual.html 2015-10-27 19:55:59.351821860 +0200 @@ -202,6 +202,40 @@ .hdlist td { vertical-align: top; } +@media screen { + body { + max-width: 50em; /* approximately 80 characters wide */ + margin-left: 16em; + } + + #toc { + position: fixed; + top: 0; + left: 0; + bottom: 0; + width: 13em; + padding: 0.5em; + padding-bottom: 1.5em; + margin: 0; + overflow: auto; + border-right: 3px solid #f8f8f8; + background-color: white; + } + + #toc .toclevel1 { + margin-top: 0.5em; + } + + #toc .toclevel2 { + margin-top: 0.25em; + display: list-item; + color: #aaaaaa; + } + + #toctitle { + margin-top: 0.5em; + } +} </style> <script type="text/javascript"> /*<![CDATA[*/ @@ -486,10 +520,10 @@ <li> <p> The <em>SEARCH</em> function is activated by pressing control-F or command-F on -the keyboard. A text box appears at the bottom right-hand of the window (see image below). +the keyboard. A text box appears at the bottom right-handof the window (see image below). For instance, if one typed the word "<em>weights</em>" into the search text box, this word will be searched for throughout this user manual. To the right of the search text box are two arrows pointing -upwards and downwards. Selecting these allow finding, respectively, the previous and the next occurence of +up and down. Selecting these allow finding, respectively, the previous and the next occurence of the term being searched for. </p> </li> @@ -507,9 +541,9 @@ This brings up a context menu for jumping to previous links selected while reading the manual (see image above). For instance if a link in the manual has been selected, then the option to <em>Go Back</em> shows the text at the last link that was selected (similar to the Previous Page -button in a browser). Conversely the <em>Go Forward</em> option enables jumping to the +button in most web browsers). Conversely the <em>Go Forward</em> option enables jumping to the text perused before selecting the <em>Go Back</em> option. The <em>Reload</em> option causes the complete -user manual to be reloaded into the user manual window. +user manual to be reladed into the user manual window. </p> </li> </ul></div> @@ -1060,11 +1094,7 @@ address and its pairing status. If the device is not paired and has a red background colour, a context menu can be opened by selecting the item with a right-click. -Select the the <em>Pair</em> option and wait for the task to complete. If this dive computer -is being paired to Subsurface for the first time, it is possible that Subsurface will -request a Pass Code or PIN number. The most commonly-used Pass Code is 0000, -and this works for the Shearwater Petrel. If necessary, consult the user manual of the -dive computer being used.</p></div> +Select the the <em>Pair</em> option and wait for the task to complete.</p></div> <div class="sidebarblock"> <div class="content"> <div class="admonitionblock"> @@ -1104,14 +1134,9 @@ <img src="images/DC_import_Bluetooth_Windows.png" alt="FIGURE: Download Bluetooth on Windows" /> </div> </div> -<div class="paragraph"><p>On <em>Windows</em> platforms the <em>Local Bluetooth device details section</em> on the right is not displayed as -is the case on the Linux/Mac implementations. +<div class="paragraph"><p>On <em>Windows</em> platforms the <em>Local Bluetooth device details section</em> on the right is not displayed. To successfully initiate a scan (by pressing the <em>Scan</em> button) -check that the Bluetooth device on the <em>Subsurface</em> computer is turned on by selecting -the dive computer from the list of available Bluetooth devices (see image above). If the dive computer -is accessed by Subsurface for the first time, it is possible that Subsurface will -request a Pass Code/PIN number. Supply the Pass Code recommended in the user manual of the dive computer. -A Pass Code of 0000 is often appropriate.</p></div> +check that the Bluetooth device on the <em>Subsurface</em> computer is turned on.</p></div> <div class="paragraph"><p>The pairing step is checked and done automatically during the download process. If the devices have never been paired the system will ask for your permissions and put a message on the right side of the screen: <em>Add a @@ -1123,11 +1148,10 @@ <td class="icon"> <img src="images/icons/important.png" alt="Important" /> </td> -<td class="content">Currently <em>Subsurface</em> works only with local Bluetooth +<td class="content">Be aware that currently <em>Subsurface</em> works only with local Bluetooth adapters which use Microsoft Bluetooth Stack. If the local device uses -<em>Widcomm</em>, <em>Stonestreet One Bluetopia Bluetooth</em> or <em>BlueSoleil</em> drivers it -will definitely not work. However, Bluetooth hardware/dongles from these manufacturers -(e.g. iSonic) that support the Microsoft Bluetooth Stack do work.</td> +<em>Widcomm</em>, <em>Stonestreet One Bluetopia Bluetooth</em> or <em>BlueSolei</em> drivers it +will definitely not work.</td> </tr></table> </div> <div class="paragraph"><p>A log messageOn the bottom left of the <em>Remote Bluetooth device selection</em> @@ -5292,7 +5316,7 @@ <img src="images/icons/bluetooth.jpg" alt="Note" /> </td> <td class="content">For dive computers communicating through Bluetooth like the Heinrichs -Weikamp Frog or the Shearwater Predator, Petrel and Nerd there is a +Weikamp Frog or the Shearwater Predator and Petrel there is a different procedure to get the devices name to communicate with <em>Subsurface</em>. Follow these steps:</td> </tr></table> @@ -5305,7 +5329,7 @@ </li> </ul></div> <div class="paragraph"><p>For Bluetooth pairing of the dive computer, refer to the -manufacturer’s user guide. When using a Shearwater Predator/Petrel/Nerd, select +manufacturer’s user guide. When using a Shearwater Predator/Petrel, select <em>Dive Log → Upload Log</em> and wait for the <em>Wait PC</em> message.</p></div> <div class="ulist"><ul> <li> @@ -5365,7 +5389,7 @@ </p> </li> </ul></div> -<div class="paragraph"><p>Ensure the dive computer is in upload mode. On the <em>Shearwater Petrel</em>, <em>Petrel 2</em> and <em>Nerd</em> +<div class="paragraph"><p>Ensure the dive computer is in upload mode. On the <em>Shearwater Petrel</em> and <em>Petrel 2</em>, cycle through the menu, select <em>Dive Log</em>, then <em>Upload Log</em>. The display will read <em>Initializing</em>, then <em>Wait PC 3:00</em> and will countdown. Once the connection is established, the display reads <em>Wait CMD …</em> and the countdown continues. When downloading the dive from Subsurface, the display reads <em>Sending</em> then @@ -5482,17 +5506,12 @@ <div class="ulist"><ul> <li> <p> -<em>Shearwater Petrel 1</em>: channel 1 -</p> -</li> -<li> -<p> <em>Shearwater Petrel 2</em>: channel 5 </p> </li> <li> <p> -<em>Shearwater Nerd</em>: channel 5 +<em>Shearwater Petrel 1</em>: channel 1 </p> </li> <li> @@ -5654,7 +5673,7 @@ </div> </div> <div class="sect2"> -<h3 id="_importing_from_shearwater_predator_petrel_nerd_using_bluetooth">16.5. Importing from Shearwater Predator/Petrel/Nerd using Bluetooth</h3> +<h3 id="_importing_from_shearwater_predator_petrel_using_bluetooth">16.5. Importing from Shearwater Predator/Petrel using Bluetooth</h3> <div class="admonitionblock"> <table><tr> <td class="icon"> @@ -6630,7 +6649,7 @@ <div id="footer"> <div id="footer-text"> Last updated - 2015-10-27 19:31:36 EET + 2015-10-22 14:55:59 SAST </div> </div> </body>
_______________________________________________ subsurface mailing list subsurface@subsurface-divelog.org http://lists.subsurface-divelog.org/cgi-bin/mailman/listinfo/subsurface