Correcting typos and updating import time

handbook/computing/yourlaptop.html

@@ -102,7 +102,7 @@ but all the recommended software here is open source (and please don't install p
    <li><a href="https://gitforwindows.org/">Git for Windows</a> - not as simple to use as it looks
    <li><a href="https://www.gitkraken.com/">GitKraken</a> - Very pretty GUI interface to git, also Linux version. 
     Times-out for our server unless you buy it but free for university people.
-<li><a href="https://www.python.org/downloads/windows/">python for windows</a>. We are moving from python 2.7 to python 3.8 during June 2020.
+<li><a href="https://www.python.org/downloads/windows/">python for windows</a>. We are moving from python 2.7 to python 3.7 during June 2020.
 <li><a href="https://winscp.net/eng/download.php">WinScp</a> can be used as an alternative to Filezilla if you like.
 <li><a href="https://www.java.com/en/">java</a> - needed for GPSprune and CaveConverter. Has to be installed separately on a Windows machine.
 <li><a href="https://notepad-plus-plus.org/">Notepad++</a> or any other syntax-highlighting code editor for HTML and python such as <a href="https://www.aptana.com/">Aptana Studio</a>. Configuring these to syntax-highlight .svx files has yet to be done.

handbook/l/trogclass-1.html

@@ -55,7 +55,7 @@ The purpose of class diagram is to model the static view of an application: the
 
 <h3>Other UML Diagrams documenting Expo systems</h3>
 <p>Class diagrams describe structure, but there are useful diagrams that describe <em>behaviour</em> too. Not much of our process is complicated enough to need them though.
-<p>The <a href="life-wallet.html">wallet lifecycle</a> is a "<a href="https://en.wikipedia.org/wiki/Interaction_overview_diagram">interaction</a>" diagram showing the states and transitions between the states for a plastic wallet holding original caving notes and the software equivalent directory. The <a href="seq-wallet">wallet process</a> is a "<a href="https://en.wikipedia.org/wiki/Sequence_diagram">sequence</a>" diagram showing which actors (people) interact with a wallet during its lifecycle: inserting pages from the waterproof notebook, taking the notes and sketches and scanning the, processing the survey data to produce centreline plots etc.
+<p>The <a href="life-wallet.html">wallet lifecycle</a> is a "<a href="https://en.wikipedia.org/wiki/Interaction_overview_diagram">interaction</a>" diagram showing the states and transitions between the states for a plastic wallet holding original caving notes and the software equivalent directory. The <a href="seq-wallet.html">wallet process</a> is a "<a href="https://en.wikipedia.org/wiki/Sequence_diagram">sequence</a>" diagram showing which actors (people) interact with a wallet during its lifecycle: inserting pages from the waterproof notebook, taking the notes and sketches and scanning the, processing the survey data to produce centreline plots etc.
 <p>The hand-drawn sketch title "Packages" on the <a href="../troggle/trogarch.html">troggle architecture</a> page is a UML "deployment" diagram.
 <p>See <a href="https://www.martinfowler.com/tags/uml.html">Fowlers pages on UML</a> for more examples of UML in use.
 

handbook/troggle/trogdjango.html

@@ -49,7 +49,14 @@
 <h3>Important Tricks</h3>
 <p>There are five critical tricks that make everything much, much easier:
 <ol>
-<li>Use pip venv to set up a virtual python environment within which you can easily and quickly change the specific releases of python, django, django's dependencies and django plugins.<li>Use the <em>highest release number</em> when upgrading between minor-versions of django. <br />So we went from 1.8.19 to 1.9.13 to 1.10.8 to 1.11.29 . Next will be 2.0.13, then 2.1.15 and then 2.2.15 .
+<li>Use <a href="https://docs.python.org/3/library/venv.html">pip venv</a> to set up a virtual python environment within which you can easily and quickly change the specific releases of python, django, django's dependencies and django plugins.
+   With a previously created venv <var>t37</var> start it up like this:<br />
+        <var>cd t37<br />
+        source bin/activate<br />
+        python --version<br />
+        cd troggle<br />
+        python manage.py test -v 3</var>
+<li>Use the <em>highest release number</em> when upgrading between minor-versions of django. <br />So we went from 1.8.19 to 1.9.13 to 1.10.8 to 1.11.29 . Next will be 2.0.13, then 2.1.15 and then 2.2.15 .
 <li>Use the django 'check' maintenance system at the most verbose setting at each release<br />
 <var>troggle$ python manage.py check -v 3 --deploy</var><br>
 <var>troggle$ python -Wall manage.py check</var><br>
@@ -76,7 +83,7 @@
 <li>testing:
 <ul>
 <li>run <var>troggle$ python manage.py test</var>
-<li>run the full data import <var>troggle$ python databaseReset reset R000</var>. It should take about 80 seconds to import everything.
+<li>run the full data import <var>troggle$ python databaseReset.py reset R000</var>. It should take about 80 seconds to import everything.
 <li>start the runserver in the other terminal window and open a web browser to http://localhost:8000 and check important pages which we don't have tests for (yet):
 <br>- <var><a href="http://localhost:8000/pathsreport">http://localhost:8000/pathsreport</a></var>
 <br>- <var><a href="http://localhost:8000/stats">http://localhost:8000/stats</a></var>
@@ -99,7 +106,7 @@
 <li>run the script <var>./pre-run.sh</var> to clean up everything before the next round of tests.
 
 </ol>
-<p>You can upgrade the version of python installed within pip but not downgrade. So get that first venv installed right.
+<p>You can upgrade the version of python installed within pip venv but not downgrade. So get that first venv installed right.
 
 <p>Here is example of installed (Version) and most-recent-available (Latest)  verisons of pip installations.
 <pre><code>$ pip list -o