Pretty pictures and URL fix

handbook/computing/yourlaptop.html

@@ -21,30 +21,35 @@ The <i>expo laptop</i> uses <a href="https://www.debian.org/intro/about">Debian<
 
 <li>Mac users will need to use the Linux documentation as a guide and work it all out for themselves.
 
-<li>Android phone apps can be very handy too.
+<li>Android phone apps can be invaluable too.
 </ul>
 
-<h3>Software</h3>
+<h3>Software</h3><a href="https://survex.com/screenshots.html"><img src="https://survex.com/img/aven-1.2.37-by-date.png" hspace="20"  align="right" width="300"></a>
-<p>Long-standing Expo policy is to retain absolute control of all software and all data. So we use <a href="https://en.wikipedia.org/wiki/Free_and_open-source_software">FOSS software</a> and we store data in text files not in a database. You can use other software on your own machine if it is format-compatible and exports data in the formats we want, but all the recommended software here is open source and please don't install proprietary software on the '<em>expo laptop</em>'.
+<p></a>Long-standing Expo policy is to retain absolute control of all software and all data. So we use <a href="https://en.wikipedia.org/wiki/Free_and_open-source_software">FOSS software</a> and we store data in text files not in a database. You can use other software on your own machine if it is format-compatible and exports data in the formats we want, but all the recommended software here is open source and please don't install proprietary software on the '<em>expo laptop</em>'.</p>
 
-<p>The list of software: <a href="https://survex.com/screenshots.html"><img src="https://survex.com/img/aven-1.2.37-by-date.png" align="right" width="350"></a>
+
+<p>The list of software: 
 <ul>
 <li><a href="https://www.mercurial-scm.org/">mercurial</a> - distributed version control system
 <li><a href="https://git-scm.com/">git</a> - distributed version control system - already installed on Linux probably
 <li><a href="https://tortoisehg.bitbucket.io/">TortoiseHg</a> - GUI to mercurial
 <li><a href="https://tortoisegit.org/support/faq/#prerequisites">TortoiseGit</a> - GUI interface to git
-<li>ftp GUI software, such as <a href="../fzconfig.html">Filezilla</a> - with a configuration file to get to the expo server
+<li><a href="../fzconfig.html">Filezilla</a> - ftp GUI software with a configuration file to get to the expo server 
 <li><a href="https://survex.com/download.html">Survex</a>, including the Aven visualisation tool.
 <li><a href="https://github.com/CaveSurveying/tunnelx">Tunnel</a>: a  Java 2.5D cave drawing program surveys based on Survex-compatible data which can also read PocketTopo files. (Generally called 'tunnel' even though the project and executable is actually 'tunnelx'.)
-<li><a href="https://therion.speleo.sk/">therion.speleo.sk/</a>Therion - Therion processes survey data and generates maps or 3D models of caves. 
+<li><a href="https://therion.speleo.sk/">Therion</a> - Therion processes survey data and generates maps or 3D models of caves. 
 <li><a href="https://www.qgis.org/en/site/">QGIS</a> - A Free and Open Source Geographic Information System
 <li><a href="https://activityworkshop.net/software/gpsprune/development.html">GPSprune</a> - to edit GPS tracks in GPX files. Just download the .jar file.
 <li><a href="https://www.java.com/en/">java</a> - needed to run GPSprune
 <li><a href="https://sourceforge.net/projects/viking/">Viking</a> - an alternative to GPSprune. The <a href="https://github.com/viking-gps/viking">code</a> is on github.
-<li>python, if you are extending troggle or the scripts in expoweb/noinfo/ - already installed on Linux
+<li>python, if you are extending troggle or the scripts in expoweb/noinfo/ - already installed on Linux <img src="https://www.python.org/favicon.ico" width=64 hspace="20" align="right">
 <li>python packages you will want to install: [<em>not yet documented</em>]
 </ul>
-<p>Nearly all our Austrian surveys have beeen produced using Tunnel but we are moving to Therion for new caves because Therion does elevations properly and Tunnel never will.
+<p>Nearly all our Austrian surveys have beeen produced using Tunnel but we are moving to Therion for new caves because Therion does elevations properly and Tunnel never will.</p>
+
+<a href="https://therion.speleo.sk/2D.php"><img src="https://therion.speleo.sk/img/head.jpg" hspace="20"></a>
+
+
 
 <p>For Windows users only:
 <ul>
@@ -60,7 +65,7 @@ The <i>expo laptop</i> uses <a href="https://www.debian.org/intro/about">Debian<
 <li><a href="https://www.termius.com/">Termius</a> - command line to create a key for your phone and to ssh login to the expo server.
 <li><a href="https://osmand.net/">OsmAnd</a> - a GPS app. See also <a href="../essentials.html">GPS configuration pages</a> 
 <li><a href="http://www.gpsessentials.com/">GPSessentials</a> - another GPS app.  
-<li><a href="../uploading.html#android">andftp</a> app - needs an <a href="computing/keyexchange.html">ssh key</a> installed on your phone
+<li><a href="../uploading.html#android">andftp</a> FTP app - needs an <a href="computing/keyexchange.html">ssh key</a> installed on your phone
 <li><a href="https://sites.google.com/site/speleoapps/home">TopoDroid</a> makes cave surveys with the DistoX.
 <li><a href="https://sites.google.com/site/speleoapps/home">Cave3D</a> is a Therion 3D viewer.
 <li><a href="https://sites.google.com/site/speleoapps/home">ThManager</a> organizes single surveys, exported by TopoDroid, into Therion projects encoded by Therion "thconfig" files.
@@ -71,7 +76,7 @@ The <i>expo laptop</i> uses <a href="https://www.debian.org/intro/about">Debian<
 <ul>
 <li><a href="https://github.com/join">Github</a> - create your own github account if you don't have one already.
 <li><a href="https://bitbucket.org/product/">Bitbucket</a> - create an account to help develop tunnel.
-<li><a href="https://trac.survex.com/wiki">Trac issue tracker and wiki</a> for survex
+<li><a href="https://trac.survex.com/wiki">Trac issue tracker and wiki</a> for developing  survex
 <li><a href="https://launchpad.net/">Launchpad</a> - create an account to help develop survex.
 </ul>
 
@@ -93,14 +98,14 @@ to <a href="https://blog.shvetsov.com/2010/03/making-pageant-automatically-load-
 
 <p><a href="../tortoise/tortoise-win.htm">Installing TortoiseHg and PuTTy on Windows</a> - full illustrated instructions.
 
-<p><a href="../fzconfig.html">Installing Filezilla</a> - - full illustrated instructions.
+<p><a href="../fzconfig.html">Installing Filezilla</a> - - full illustrated instructions. <img src="https://wiki.filezilla-project.org/favicon.ico" width=64 hspace="20" align="right">
 
 <p>When using Windows please, please be <a href="http://expo.survex.com/handbook/survey/getin.htm#filenames">excessively careful when naming files and survex names</a> and be <a href="../manual.html#quickstart">exceptionally careful when using rsync</a>.
 
-<p>The handbook has extensive documentation on when and where it is necessary to use scp and ftp to manage large files in 'expofiles'. See <a href="../upload-expert.html">Experts: Uploading files</a>, a href="../uploading.html">Uploading files</a> and  <a href="../gpxupload.html">Uploading GPS tracks</a>. Only machines which have done the key exchange process can do scp, ftp or rsync.
+<p>The handbook has documents where it is necessary to use scp or sftp to manage large files in 'expofiles'. See <a href="../upload-expert.html">Experts: Uploading files</a>, <a href="../uploading.html">Uploading files</a> and  <a href="../gpxupload.html">Uploading GPS tracks</a>. Only machines which have done the key exchange process can do scp, sftp or rsync.
 
 <h3>Learning how to use this software</h3>
-<img src="/expofiles/tunnelwiki/wiki/images/6/65/Banner204.png" align="right" width=100>
+<img src="/expofiles/tunnelwiki/wiki/images/6/65/Banner204.png" align="right" width=400>
 <p>For Survex, Tunnel and Therion, see the <a href="http://expo.survex.com/handbook/survey/">Expo Surveying Handbook</a>.
 
 <p><em>For installing Survex, Tunnel etc. see <a href="../getsurvex.html">this page</a> which will be merged in here eventually.</em>