updates for WSL and python - online edit of handbook/troggle/troglaptop.html

handbook/troggle/troglaptop.html

@@ -47,12 +47,12 @@ http://expo.survex.com/repositories/troggle/.git/tree/README.txt
     </ul>
   <li>Windows 10 or 11 machine
     <ul>
-    <li>[On 23 November 2022 a new way of installing and using WSL was announced, see <a href="https://www.theregister.com/2022/11/23/wsl_microsoft_store_default_version/">
-Windows Subsystem for Linux now packaged as a Microsoft Store app</a> so all documentation on this expo site needs to be revised.]
+    <li>In late 2022 a new way of installing and using WSL was announced, see <a href="https://www.theregister.com/2022/11/23/wsl_microsoft_store_default_version/">
+Windows Subsystem for Linux now packaged as a Microsoft Store app</a> so WSL documentation on this expo site has been revised.
 <li>See our own expo page about <a href="../computing/wsllaptop.html">setting up a WSL Expo Laptop</a>
     <li>Install in <a href="https://docs.microsoft.com/en-us/windows/wsl/install">WSL on Windows 10/11</a>
-  <li>Install <a href="https://docs.microsoft.com/en-us/windows/wsl/install">Ubuntu 20.04 LTS</a>  - can be done directly from wsl command line <var>wsl --install -d Ubuntu</var>.
-  <li>Install <a href="https://linuxconfig.org/ubuntu-22-04-on-wsl-windows-subsystem-for-linux">Ubuntu 22.04 LTS</a> - must be done using MS App Store.
+      <li>[<em>obsolete</em> Install <a href="https://docs.microsoft.com/en-us/windows/wsl/install">Ubuntu 20.04 LTS</a>  - can be done directly from wsl command line <var>wsl --install -d Ubuntu</var> ].
+        <li>Install <a href="https://linuxconfig.org/ubuntu-22-04-on-wsl-windows-subsystem-for-linux">Ubuntu 22.04 LTS</a> - must be done using <a href="https://support.microsoft.com/en-us/account-billing/how-to-open-microsoft-store-on-windows-e080b85a-7c9e-46a7-8d8b-3e9a42e32de6">MS App Store</a>.
       </ul>
 </ul>
 <p>There are two scripts in the <var>troggle</var> folder which will do semi-automatically what is described below. Have a look at
@@ -66,8 +66,8 @@ Windows Subsystem for Linux now packaged as a Microsoft Store app</a> so all doc
 <p>Do familiarise yourself with the directory structure on the expo server, which we will be duplicating (partly) as docmented in <a href="serverconfig.html">The Expo Server</a>. We are not here doing a full install of all the software and scripts on the server, just the minimum to run, test and debug troggle on Django. These will be setup for you by <var>venv-trog.sh</var>.
 
 <h3>WSL on Windows</h3>
-<p><p>[On 23 November 2022 a new way of installing and using WSL was announced, see <a href="https://www.theregister.com/2022/11/23/wsl_microsoft_store_default_version/">
-Windows Subsystem for Linux now packaged as a Microsoft Store app</a> so all documentation on this expo site needs to be revised.]
+<p><p> 
+Windows Subsystem for Linux now packaged as <a href="https://www.theregister.com/2022/11/23/wsl_microsoft_store_default_version/">a Microsoft Store app</a>, see above.
 <p>If you are using an old laptop, you may have to run Ubuntu in WSL1 rather than WSL2. WSL2 requires virtualisation features that your hardware may not support if it is more than about 5 years old.
 <p>The standard documentation for Ubuntu or debian below all works, but you should first skim the 
   <a href="../computing/winlaptop.html">Windows expo laptop</a> configuration too. <em>So far as expo software</em> is concerned, WSL1 and WSL2 behave identically. <p>...Except for file permissions, which can cost you a day of frustration if you are unlucky.
@@ -99,7 +99,7 @@ git config --global pull.rebase true
 <a href="https://xkcd.com/1987/"><img src="https://imgs.xkcd.com/comics/python_environment.png" align="right" hspace="20"  width="230" alt='XKCD python install'></a>
 
 <p>Python is not installed by default on Debian, and in any case we need specific versions to be installed. For Ubuntu 20.04 the 
-default installation is python3.9 whereas Ubuntu 22.04 gives you python3.10. 
+  default installation is python3.9 whereas Ubuntu 22.04 gives you python3.10 (but it may not if using WSL, depending on your history. See the <a href="https://expo.survex.com/handbook/computing/wsllaptop.html">Expo WSL page</a> for more).
 <p>If you are planning on eventually helping the migration of troggle from debian Bullseye (v11) to 
 <a href="https://www.debian.org/releases/">Bookworm (v12)</a> to then you will also want the appropriate later versions of python e.g. 3.10 on Ubuntu 20.04 like this:
 
@@ -130,7 +130,7 @@ environment (a 'venv'), not in the main linux system.
 <h2 id="links">Creating folders and soft links</h2>
 <p>We need to have the folder structure that troggle expects. On your own machine 
 you will have your own logon id, and you do not need to create an 'expo' user, but
-you do need to create folders where and an 'expo' user would have them. Make links there
+you do need to create folders where an 'expo' user would have them. Make links there
 to wherever you have actually installed the repos. So if you have installed all your repos
 in <var>/mnt/c/EXPO/</var>, then you would need to do this:
 <pre><code>cd ~
@@ -156,6 +156,8 @@ confusing and apparently inconsistent behaviour: e.g. you will upload a file but
 
 <p>For development, you mostly only need a local copy of the wallets and scanned survey notes and sketches in 
 <var>expofiles/surveyscans</var> which is less than 5GB.
+  
+  <p>You can, if you like, have the expo photo archive collection somewhere else, not inside <var>expofiles</var>, on a troggle development machine. To do this set the PHOTOS_ROOT appropriately in <var>troggle/localsettings.py</var>. By default it is <var>PHOTOS_ROOT = EXPOFILES / 'photos'</var>. This is handy if you want everything else in expofiles in your Linux home drive for speed, but don't care about speed for the 29GB of photos which can sit on an SDdrive.
 
 <h2>Installing Django and troggle</h2>
 <img src="Django_Logo-420x180.png" align="right" hspace="20" width='210' alt='django logo'>